Commit a8414fa3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'xfs-iomap-for-linus-4.8-rc3' of... 

Merge tag 'xfs-iomap-for-linus-4.8-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/dgc/linux-xfs

Pull xfs and iomap fixes from Dave Chinner:
 "Changes in this update:

  Regression fixes for XFS changes introduce in 4.8-rc1:
   - buffer IO accounting assert failure
   - ENOSPC block accounting reservation issue
   - DAX IO path page cache invalidation fix
   - rmapbt on-disk block count in agf
   - correct classification of rmap block type when updating AGFL.
   - iomap support for attribute fork mapping

  Regression fixes for iomap infrastructure in 4.8-rc1:
   - fiemap: honor FIEMAP_FLAG_SYNC
   - fiemap: implement FIEMAP_FLAG_XATTR support to fix XFS regression
   - make mark_page_accessed and pagefault_disable usage consistent with
     other IO paths"

* tag 'xfs-iomap-for-linus-4.8-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/dgc/linux-xfs:
  xfs: remove OWN_AG rmap when allocating a block from the AGFL
  xfs: (re-)implement FIEMAP_FLAG_XATTR
  xfs: simplify xfs_file_iomap_begin
  iomap: mark ->iomap_end as optional
  iomap: prepare iomap_fiemap for attribute mappings
  iomap: fiemap should honor the FIEMAP_FLAG_SYNC flag
  iomap: remove superflous pagefault_disable from iomap_write_actor
  iomap: remove superflous mark_page_accessed from iomap_write_actor
  xfs: store rmapbt block count in the AGF
  xfs: don't invalidate whole file on DAX read/write
  xfs: fix bogus space reservation in xfs_iomap_write_allocate
  xfs: don't assert fail on non-async buffers on ioacct decrement
parents 3f318b3c 32438cf9

fs/iomap.c

+13 −8
Original line number Diff line number Diff line
@@ -84,8 +84,11 @@ iomap_apply(struct inode *inode, loff_t pos, loff_t length, unsigned flags, 
	 * Now the data has been copied, commit the range we've copied.  This

	 * should not fail unless the filesystem has had a fatal error.

	 */

	ret = ops->iomap_end(inode, pos, length, written > 0 ? written : 0,

	if (ops->iomap_end) {

		ret = ops->iomap_end(inode, pos, length,

				     written > 0 ? written : 0,

				     flags, &iomap);

	}



	return written ? written : ret;

}
@@ -194,12 +197,9 @@ again: 
		if (mapping_writably_mapped(inode->i_mapping))

			flush_dcache_page(page);



		pagefault_disable();

		copied = iov_iter_copy_from_user_atomic(page, i, offset, bytes);

		pagefault_enable();



		flush_dcache_page(page);

		mark_page_accessed(page);



		status = iomap_write_end(inode, pos, bytes, copied, page);

		if (unlikely(status < 0))
@@ -470,13 +470,18 @@ int iomap_fiemap(struct inode *inode, struct fiemap_extent_info *fi, 
	if (ret)

		return ret;



	if (fi->fi_flags & FIEMAP_FLAG_SYNC) {

		ret = filemap_write_and_wait(inode->i_mapping);

		if (ret)

			return ret;

	}



	while (len > 0) {

		ret = iomap_apply(inode, start, len, 0, ops, &ctx,

				iomap_fiemap_actor);

		/* inode with no (attribute) mapping will give ENOENT */

		if (ret == -ENOENT)

			break;

		if (ret < 0)

			return ret;

		if (ret == 0)

fs/xfs/libxfs/xfs_alloc.c

+14 −0
Original line number Diff line number Diff line
@@ -1582,6 +1582,7 @@ xfs_alloc_ag_vextent_small( 
	xfs_extlen_t	*flenp,	/* result length */

	int		*stat)	/* status: 0-freelist, 1-normal/none */

{

	struct xfs_owner_info	oinfo;

	int		error;

	xfs_agblock_t	fbno;

	xfs_extlen_t	flen;
@@ -1624,6 +1625,18 @@ xfs_alloc_ag_vextent_small( 
				error0);

			args->wasfromfl = 1;

			trace_xfs_alloc_small_freelist(args);



			/*

			 * If we're feeding an AGFL block to something that

			 * doesn't live in the free space, we need to clear

			 * out the OWN_AG rmap.

			 */

			xfs_rmap_ag_owner(&oinfo, XFS_RMAP_OWN_AG);

			error = xfs_rmap_free(args->tp, args->agbp, args->agno,

					fbno, 1, &oinfo);

			if (error)

				goto error0;



			*stat = 0;

			return 0;

		}
@@ -2264,6 +2277,7 @@ xfs_alloc_log_agf( 
		offsetof(xfs_agf_t, agf_longest),

		offsetof(xfs_agf_t, agf_btreeblks),

		offsetof(xfs_agf_t, agf_uuid),

		offsetof(xfs_agf_t, agf_rmap_blocks),

		sizeof(xfs_agf_t)

	};

fs/xfs/libxfs/xfs_format.h

+8 −3
Original line number Diff line number Diff line
@@ -640,12 +640,15 @@ typedef struct xfs_agf { 
	__be32		agf_btreeblks;	/* # of blocks held in AGF btrees */

	uuid_t		agf_uuid;	/* uuid of filesystem */



	__be32		agf_rmap_blocks;	/* rmapbt blocks used */

	__be32		agf_padding;		/* padding */



	/*

	 * reserve some contiguous space for future logged fields before we add

	 * the unlogged fields. This makes the range logging via flags and

	 * structure offsets much simpler.

	 */

	__be64		agf_spare64[16];

	__be64		agf_spare64[15];



	/* unlogged fields, written during buffer writeback. */

	__be64		agf_lsn;	/* last write sequence */
@@ -670,7 +673,8 @@ typedef struct xfs_agf { 
#define	XFS_AGF_LONGEST		0x00000400

#define	XFS_AGF_BTREEBLKS	0x00000800

#define	XFS_AGF_UUID		0x00001000

#define	XFS_AGF_NUM_BITS	13

#define	XFS_AGF_RMAP_BLOCKS	0x00002000

#define	XFS_AGF_NUM_BITS	14

#define	XFS_AGF_ALL_BITS	((1 << XFS_AGF_NUM_BITS) - 1)



#define XFS_AGF_FLAGS \
@@ -686,7 +690,8 @@ typedef struct xfs_agf { 
	{ XFS_AGF_FREEBLKS,	"FREEBLKS" }, \

	{ XFS_AGF_LONGEST,	"LONGEST" }, \

	{ XFS_AGF_BTREEBLKS,	"BTREEBLKS" }, \

	{ XFS_AGF_UUID,		"UUID" }

	{ XFS_AGF_UUID,		"UUID" }, \

	{ XFS_AGF_RMAP_BLOCKS,	"RMAP_BLOCKS" }



/* disk block (xfs_daddr_t) in the AG */

#define XFS_AGF_DADDR(mp)	((xfs_daddr_t)(1 << (mp)->m_sectbb_log))

fs/xfs/libxfs/xfs_rmap_btree.c

+6 −0
Original line number Diff line number Diff line
@@ -98,6 +98,8 @@ xfs_rmapbt_alloc_block( 
	union xfs_btree_ptr	*new,

	int			*stat)

{

	struct xfs_buf		*agbp = cur->bc_private.a.agbp;

	struct xfs_agf		*agf = XFS_BUF_TO_AGF(agbp);

	int			error;

	xfs_agblock_t		bno;
@@ -124,6 +126,8 @@ xfs_rmapbt_alloc_block( 


	xfs_trans_agbtree_delta(cur->bc_tp, 1);

	new->s = cpu_to_be32(bno);

	be32_add_cpu(&agf->agf_rmap_blocks, 1);

	xfs_alloc_log_agf(cur->bc_tp, agbp, XFS_AGF_RMAP_BLOCKS);



	XFS_BTREE_TRACE_CURSOR(cur, XBT_EXIT);

	*stat = 1;
@@ -143,6 +147,8 @@ xfs_rmapbt_free_block( 
	bno = xfs_daddr_to_agbno(cur->bc_mp, XFS_BUF_ADDR(bp));

	trace_xfs_rmapbt_free_block(cur->bc_mp, cur->bc_private.a.agno,

			bno, 1);

	be32_add_cpu(&agf->agf_rmap_blocks, -1);

	xfs_alloc_log_agf(cur->bc_tp, agbp, XFS_AGF_RMAP_BLOCKS);

	error = xfs_alloc_put_freelist(cur->bc_tp, agbp, NULL, bno, 1);

	if (error)

		return error;

fs/xfs/xfs_buf.c

+0 −1
Original line number Diff line number Diff line
@@ -115,7 +115,6 @@ xfs_buf_ioacct_dec( 
	if (!(bp->b_flags & _XBF_IN_FLIGHT))

		return;



	ASSERT(bp->b_flags & XBF_ASYNC);

	bp->b_flags &= ~_XBF_IN_FLIGHT;

	percpu_counter_dec(&bp->b_target->bt_io_count);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE