Commit 02a2b053 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'xfs-4.14-fixes-2' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux 

Pull xfs fixes from Darrick Wong:

 - fix various problems with the copy-on-write extent maps getting freed
   at the wrong time

 - fix printk format specifier problems

 - report zeroing operation outcomes instead of dropping them on the
   floor

 - fix some crashes when dio operations partially fail

 - fix a race condition between unwritten extent conversion & dio read

 - fix some incorrect tests in the inode log item processing

 - correct the delayed allocation space reservations on rmap filesystems

 - fix some problems checking for dax support

* tag 'xfs-4.14-fixes-2' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux:
  xfs: revert "xfs: factor rmap btree size into the indlen calculations"
  xfs: Capture state of the right inode in xfs_iflush_done
  xfs: perag initialization should only touch m_ag_max_usable for AG 0
  xfs: update i_size after unwritten conversion in dio completion
  iomap_dio_rw: Allocate AIO completion queue before submitting dio
  xfs: validate bdev support for DAX inode flag
  xfs: remove redundant re-initialization of total_nr_pages
  xfs: Output warning message when discard option was enabled even though the device does not support discard
  xfs: report zeroed or not correctly in xfs_zero_range()
  xfs: kill meaningless variable 'zero'
  fs/xfs: Use %pS printk format for direct addresses
  xfs: evict CoW fork extents when performing finsert/fcollapse
  xfs: don't unconditionally clear the reflink flag on zero-block files
parents e49aa15e 5e5c943c

fs/iomap.c

+7 −7
Original line number Diff line number Diff line
@@ -1009,6 +1009,13 @@ iomap_dio_rw(struct kiocb *iocb, struct iov_iter *iter, 
	WARN_ON_ONCE(ret);

	ret = 0;



	if (iov_iter_rw(iter) == WRITE && !is_sync_kiocb(iocb) &&

	    !inode->i_sb->s_dio_done_wq) {

		ret = sb_init_dio_done_wq(inode->i_sb);

		if (ret < 0)

			goto out_free_dio;

	}



	inode_dio_begin(inode);



	blk_start_plug(&plug);
@@ -1031,13 +1038,6 @@ iomap_dio_rw(struct kiocb *iocb, struct iov_iter *iter, 
	if (ret < 0)

		iomap_dio_set_error(dio, ret);



	if (ret >= 0 && iov_iter_rw(iter) == WRITE && !is_sync_kiocb(iocb) &&

			!inode->i_sb->s_dio_done_wq) {

		ret = sb_init_dio_done_wq(inode->i_sb);

		if (ret < 0)

			iomap_dio_set_error(dio, ret);

	}



	if (!atomic_dec_and_test(&dio->ref)) {

		if (!is_sync_kiocb(iocb))

			return -EIOCBQUEUED;

fs/xfs/libxfs/xfs_ag_resv.c

+10 −2
Original line number Diff line number Diff line
@@ -156,6 +156,7 @@ __xfs_ag_resv_free( 
	trace_xfs_ag_resv_free(pag, type, 0);



	resv = xfs_perag_resv(pag, type);

	if (pag->pag_agno == 0)

		pag->pag_mount->m_ag_max_usable += resv->ar_asked;

	/*

	 * AGFL blocks are always considered "free", so whatever
@@ -216,6 +217,13 @@ __xfs_ag_resv_init( 
		return error;

	}



	/*

	 * Reduce the maximum per-AG allocation length by however much we're

	 * trying to reserve for an AG.  Since this is a filesystem-wide

	 * counter, we only make the adjustment for AG 0.  This assumes that

	 * there aren't any AGs hungrier for per-AG reservation than AG 0.

	 */

	if (pag->pag_agno == 0)

		mp->m_ag_max_usable -= ask;



	resv = xfs_perag_resv(pag, type);

fs/xfs/libxfs/xfs_bmap.c

+2 −15
Original line number Diff line number Diff line
@@ -49,7 +49,6 @@ 
#include "xfs_rmap.h"

#include "xfs_ag_resv.h"

#include "xfs_refcount.h"

#include "xfs_rmap_btree.h"

#include "xfs_icache.h"
@@ -192,12 +191,8 @@ xfs_bmap_worst_indlen( 
	int		maxrecs;	/* maximum record count at this level */

	xfs_mount_t	*mp;		/* mount structure */

	xfs_filblks_t	rval;		/* return value */

	xfs_filblks_t   orig_len;



	mp = ip->i_mount;



	/* Calculate the worst-case size of the bmbt. */

	orig_len = len;

	maxrecs = mp->m_bmap_dmxr[0];

	for (level = 0, rval = 0;

	     level < XFS_BM_MAXLEVELS(mp, XFS_DATA_FORK);
@@ -205,20 +200,12 @@ xfs_bmap_worst_indlen( 
		len += maxrecs - 1;

		do_div(len, maxrecs);

		rval += len;

		if (len == 1) {

			rval += XFS_BM_MAXLEVELS(mp, XFS_DATA_FORK) -

		if (len == 1)

			return rval + XFS_BM_MAXLEVELS(mp, XFS_DATA_FORK) -

				level - 1;

			break;

		}

		if (level == 0)

			maxrecs = mp->m_bmap_dmxr[1];

	}



	/* Calculate the worst-case size of the rmapbt. */

	if (xfs_sb_version_hasrmapbt(&mp->m_sb))

		rval += 1 + xfs_rmapbt_calc_size(mp, orig_len) +

				mp->m_rmap_maxlevels;



	return rval;

}

fs/xfs/xfs_aops.c

+2 −1
Original line number Diff line number Diff line
@@ -343,7 +343,8 @@ xfs_end_io( 
		error = xfs_reflink_end_cow(ip, offset, size);

		break;

	case XFS_IO_UNWRITTEN:

		error = xfs_iomap_write_unwritten(ip, offset, size);

		/* writeback should never update isize */

		error = xfs_iomap_write_unwritten(ip, offset, size, false);

		break;

	default:

		ASSERT(!xfs_ioend_is_append(ioend) || ioend->io_append_trans);

fs/xfs/xfs_bmap_util.c

+13 −1
Original line number Diff line number Diff line
@@ -1459,7 +1459,19 @@ xfs_shift_file_space( 
		return error;



	/*

	 * The extent shiting code works on extent granularity. So, if

	 * Clean out anything hanging around in the cow fork now that

	 * we've flushed all the dirty data out to disk to avoid having

	 * CoW extents at the wrong offsets.

	 */

	if (xfs_is_reflink_inode(ip)) {

		error = xfs_reflink_cancel_cow_range(ip, offset, NULLFILEOFF,

				true);

		if (error)

			return error;

	}



	/*

	 * The extent shifting code works on extent granularity. So, if

	 * stop_fsb is not the starting block of extent, we need to split

	 * the extent at stop_fsb.

	 */

CRA Git | Maintained and supported by SUSTech CRA and CCSE