Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7fdec82a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull xfs updates from Dave Chinner:
 "There's not a lot in this - the main addition is the CRC validation of
  the entire region of the log that the will be recovered, along with
  several log recovery fixes.  Most of the rest is small bug fixes and
  cleanups.

  I have three bug fixes still pending, all that address recently fixed
  regressions that I will send to next week after they've had some time
  in for-next.

  Summary:
   - extensive CRC validation during log recovery
   - several log recovery bug fixes
   - Various DAX support fixes
   - AGFL size calculation fix
   - various cleanups in preparation for new functionality
   - project quota ENOSPC notification via netlink
   - tracing and debug improvements"

* tag 'xfs-for-linus-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/dgc/linux-xfs: (26 commits)
  xfs: handle dquot buffer readahead in log recovery correctly
  xfs: inode recovery readahead can race with inode buffer creation
  xfs: eliminate committed arg from xfs_bmap_finish
  xfs: bmapbt checking on debug kernels too expensive
  xfs: add tracepoints to readpage calls
  xfs: debug mode log record crc error injection
  xfs: detect and trim torn writes during log recovery
  xfs: fix recursive splice read locking with DAX
  xfs: Don't use reserved blocks for data blocks with DAX
  XFS: Use a signed return type for suffix_kstrtoint()
  libxfs: refactor short btree block verification
  libxfs: pack the agfl header structure so XFS_AGFL_SIZE is correct
  libxfs: use a convenience variable instead of open-coding the fork
  xfs: fix log ticket type printing
  libxfs: make xfs_alloc_fix_freelist non-static
  xfs: make xfs_buf_ioend_async() static
  xfs: send warning of project quota to userspace via netlink
  xfs: get mp from bma->ip in xfs_bmap code
  xfs: print name of verifier if it fails
  libxfs: Optimize the loop for xfs_bitmap_empty
  ...
parents f9a03ae1 dde7f55b

fs/xfs/libxfs/xfs_alloc.c

+3 −1
Original line number Diff line number Diff line
@@ -535,6 +535,7 @@ xfs_agfl_write_verify( 
}



const struct xfs_buf_ops xfs_agfl_buf_ops = {

	.name = "xfs_agfl",

	.verify_read = xfs_agfl_read_verify,

	.verify_write = xfs_agfl_write_verify,

};
@@ -1926,7 +1927,7 @@ xfs_alloc_space_available( 
 * Decide whether to use this allocation group for this allocation.

 * If so, fix up the btree freelist's size.

 */

STATIC int			/* error */

int			/* error */

xfs_alloc_fix_freelist(

	struct xfs_alloc_arg	*args,	/* allocation argument structure */

	int			flags)	/* XFS_ALLOC_FLAG_... */
@@ -2339,6 +2340,7 @@ xfs_agf_write_verify( 
}



const struct xfs_buf_ops xfs_agf_buf_ops = {

	.name = "xfs_agf",

	.verify_read = xfs_agf_read_verify,

	.verify_write = xfs_agf_write_verify,

};

fs/xfs/libxfs/xfs_alloc.h

+1 −0
Original line number Diff line number Diff line
@@ -235,5 +235,6 @@ xfs_alloc_get_rec( 


int xfs_read_agf(struct xfs_mount *mp, struct xfs_trans *tp,

			xfs_agnumber_t agno, int flags, struct xfs_buf **bpp);

int xfs_alloc_fix_freelist(struct xfs_alloc_arg *args, int flags);



#endif	/* __XFS_ALLOC_H__ */

fs/xfs/libxfs/xfs_alloc_btree.c

+4 −31
Original line number Diff line number Diff line
@@ -293,14 +293,7 @@ xfs_allocbt_verify( 
	level = be16_to_cpu(block->bb_level);

	switch (block->bb_magic) {

	case cpu_to_be32(XFS_ABTB_CRC_MAGIC):

		if (!xfs_sb_version_hascrc(&mp->m_sb))

			return false;

		if (!uuid_equal(&block->bb_u.s.bb_uuid, &mp->m_sb.sb_meta_uuid))

			return false;

		if (block->bb_u.s.bb_blkno != cpu_to_be64(bp->b_bn))

			return false;

		if (pag &&

		    be32_to_cpu(block->bb_u.s.bb_owner) != pag->pag_agno)

		if (!xfs_btree_sblock_v5hdr_verify(bp))

			return false;

		/* fall through */

	case cpu_to_be32(XFS_ABTB_MAGIC):
@@ -311,14 +304,7 @@ xfs_allocbt_verify( 
			return false;

		break;

	case cpu_to_be32(XFS_ABTC_CRC_MAGIC):

		if (!xfs_sb_version_hascrc(&mp->m_sb))

			return false;

		if (!uuid_equal(&block->bb_u.s.bb_uuid, &mp->m_sb.sb_meta_uuid))

			return false;

		if (block->bb_u.s.bb_blkno != cpu_to_be64(bp->b_bn))

			return false;

		if (pag &&

		    be32_to_cpu(block->bb_u.s.bb_owner) != pag->pag_agno)

		if (!xfs_btree_sblock_v5hdr_verify(bp))

			return false;

		/* fall through */

	case cpu_to_be32(XFS_ABTC_MAGIC):
@@ -332,21 +318,7 @@ xfs_allocbt_verify( 
		return false;

	}



	/* numrecs verification */

	if (be16_to_cpu(block->bb_numrecs) > mp->m_alloc_mxr[level != 0])

		return false;



	/* sibling pointer verification */

	if (!block->bb_u.s.bb_leftsib ||

	    (be32_to_cpu(block->bb_u.s.bb_leftsib) >= mp->m_sb.sb_agblocks &&

	     block->bb_u.s.bb_leftsib != cpu_to_be32(NULLAGBLOCK)))

		return false;

	if (!block->bb_u.s.bb_rightsib ||

	    (be32_to_cpu(block->bb_u.s.bb_rightsib) >= mp->m_sb.sb_agblocks &&

	     block->bb_u.s.bb_rightsib != cpu_to_be32(NULLAGBLOCK)))

		return false;



	return true;

	return xfs_btree_sblock_verify(bp, mp->m_alloc_mxr[level != 0]);

}



static void
@@ -379,6 +351,7 @@ xfs_allocbt_write_verify( 
}



const struct xfs_buf_ops xfs_allocbt_buf_ops = {

	.name = "xfs_allocbt",

	.verify_read = xfs_allocbt_read_verify,

	.verify_write = xfs_allocbt_write_verify,

};

fs/xfs/libxfs/xfs_attr.c

+23 −118
Original line number Diff line number Diff line
@@ -207,7 +207,7 @@ xfs_attr_set( 
	struct xfs_trans_res	tres;

	xfs_fsblock_t		firstblock;

	int			rsvd = (flags & ATTR_ROOT) != 0;

	int			error, err2, committed, local;

	int			error, err2, local;



	XFS_STATS_INC(mp, xs_attr_set);
@@ -334,24 +334,14 @@ xfs_attr_set( 
		 */

		xfs_bmap_init(args.flist, args.firstblock);

		error = xfs_attr_shortform_to_leaf(&args);

		if (!error) {

			error = xfs_bmap_finish(&args.trans, args.flist,

						&committed);

		}

		if (!error)

			error = xfs_bmap_finish(&args.trans, args.flist, dp);

		if (error) {

			ASSERT(committed);

			args.trans = NULL;

			xfs_bmap_cancel(&flist);

			goto out;

		}



		/*

		 * bmap_finish() may have committed the last trans and started

		 * a new one.  We need the inode to be in all transactions.

		 */

		if (committed)

			xfs_trans_ijoin(args.trans, dp, 0);



		/*

		 * Commit the leaf transformation.  We'll need another (linked)

		 * transaction to add the new attribute to the leaf.
@@ -568,7 +558,7 @@ xfs_attr_leaf_addname(xfs_da_args_t *args) 
{

	xfs_inode_t *dp;

	struct xfs_buf *bp;

	int retval, error, committed, forkoff;

	int retval, error, forkoff;



	trace_xfs_attr_leaf_addname(args);
@@ -628,24 +618,14 @@ xfs_attr_leaf_addname(xfs_da_args_t *args) 
		 */

		xfs_bmap_init(args->flist, args->firstblock);

		error = xfs_attr3_leaf_to_node(args);

		if (!error) {

			error = xfs_bmap_finish(&args->trans, args->flist,

						&committed);

		}

		if (!error)

			error = xfs_bmap_finish(&args->trans, args->flist, dp);

		if (error) {

			ASSERT(committed);

			args->trans = NULL;

			xfs_bmap_cancel(args->flist);

			return error;

		}



		/*

		 * bmap_finish() may have committed the last trans and started

		 * a new one.  We need the inode to be in all transactions.

		 */

		if (committed)

			xfs_trans_ijoin(args->trans, dp, 0);



		/*

		 * Commit the current trans (including the inode) and start

		 * a new one.
@@ -729,25 +709,14 @@ xfs_attr_leaf_addname(xfs_da_args_t *args) 
			xfs_bmap_init(args->flist, args->firstblock);

			error = xfs_attr3_leaf_to_shortform(bp, args, forkoff);

			/* bp is gone due to xfs_da_shrink_inode */

			if (!error) {

			if (!error)

				error = xfs_bmap_finish(&args->trans,

							args->flist,

							&committed);

			}

							args->flist, dp);

			if (error) {

				ASSERT(committed);

				args->trans = NULL;

				xfs_bmap_cancel(args->flist);

				return error;

			}



			/*

			 * bmap_finish() may have committed the last trans

			 * and started a new one.  We need the inode to be

			 * in all transactions.

			 */

			if (committed)

				xfs_trans_ijoin(args->trans, dp, 0);

		}



		/*
@@ -775,7 +744,7 @@ xfs_attr_leaf_removename(xfs_da_args_t *args) 
{

	xfs_inode_t *dp;

	struct xfs_buf *bp;

	int error, committed, forkoff;

	int error, forkoff;



	trace_xfs_attr_leaf_removename(args);
@@ -803,23 +772,13 @@ xfs_attr_leaf_removename(xfs_da_args_t *args) 
		xfs_bmap_init(args->flist, args->firstblock);

		error = xfs_attr3_leaf_to_shortform(bp, args, forkoff);

		/* bp is gone due to xfs_da_shrink_inode */

		if (!error) {

			error = xfs_bmap_finish(&args->trans, args->flist,

						&committed);

		}

		if (!error)

			error = xfs_bmap_finish(&args->trans, args->flist, dp);

		if (error) {

			ASSERT(committed);

			args->trans = NULL;

			xfs_bmap_cancel(args->flist);

			return error;

		}



		/*

		 * bmap_finish() may have committed the last trans and started

		 * a new one.  We need the inode to be in all transactions.

		 */

		if (committed)

			xfs_trans_ijoin(args->trans, dp, 0);

	}

	return 0;

}
@@ -877,7 +836,7 @@ xfs_attr_node_addname(xfs_da_args_t *args) 
	xfs_da_state_blk_t *blk;

	xfs_inode_t *dp;

	xfs_mount_t *mp;

	int committed, retval, error;

	int retval, error;



	trace_xfs_attr_node_addname(args);
@@ -938,26 +897,15 @@ xfs_attr_node_addname(xfs_da_args_t *args) 
			state = NULL;

			xfs_bmap_init(args->flist, args->firstblock);

			error = xfs_attr3_leaf_to_node(args);

			if (!error) {

			if (!error)

				error = xfs_bmap_finish(&args->trans,

							args->flist,

							&committed);

			}

							args->flist, dp);

			if (error) {

				ASSERT(committed);

				args->trans = NULL;

				xfs_bmap_cancel(args->flist);

				goto out;

			}



			/*

			 * bmap_finish() may have committed the last trans

			 * and started a new one.  We need the inode to be

			 * in all transactions.

			 */

			if (committed)

				xfs_trans_ijoin(args->trans, dp, 0);



			/*

			 * Commit the node conversion and start the next

			 * trans in the chain.
@@ -977,23 +925,13 @@ xfs_attr_node_addname(xfs_da_args_t *args) 
		 */

		xfs_bmap_init(args->flist, args->firstblock);

		error = xfs_da3_split(state);

		if (!error) {

			error = xfs_bmap_finish(&args->trans, args->flist,

						&committed);

		}

		if (!error)

			error = xfs_bmap_finish(&args->trans, args->flist, dp);

		if (error) {

			ASSERT(committed);

			args->trans = NULL;

			xfs_bmap_cancel(args->flist);

			goto out;

		}



		/*

		 * bmap_finish() may have committed the last trans and started

		 * a new one.  We need the inode to be in all transactions.

		 */

		if (committed)

			xfs_trans_ijoin(args->trans, dp, 0);

	} else {

		/*

		 * Addition succeeded, update Btree hashvals.
@@ -1086,25 +1024,14 @@ xfs_attr_node_addname(xfs_da_args_t *args) 
		if (retval && (state->path.active > 1)) {

			xfs_bmap_init(args->flist, args->firstblock);

			error = xfs_da3_join(state);

			if (!error) {

			if (!error)

				error = xfs_bmap_finish(&args->trans,

							args->flist,

							&committed);

			}

							args->flist, dp);

			if (error) {

				ASSERT(committed);

				args->trans = NULL;

				xfs_bmap_cancel(args->flist);

				goto out;

			}



			/*

			 * bmap_finish() may have committed the last trans

			 * and started a new one.  We need the inode to be

			 * in all transactions.

			 */

			if (committed)

				xfs_trans_ijoin(args->trans, dp, 0);

		}



		/*
@@ -1146,7 +1073,7 @@ xfs_attr_node_removename(xfs_da_args_t *args) 
	xfs_da_state_blk_t *blk;

	xfs_inode_t *dp;

	struct xfs_buf *bp;

	int retval, error, committed, forkoff;

	int retval, error, forkoff;



	trace_xfs_attr_node_removename(args);
@@ -1220,24 +1147,13 @@ xfs_attr_node_removename(xfs_da_args_t *args) 
	if (retval && (state->path.active > 1)) {

		xfs_bmap_init(args->flist, args->firstblock);

		error = xfs_da3_join(state);

		if (!error) {

			error = xfs_bmap_finish(&args->trans, args->flist,

						&committed);

		}

		if (!error)

			error = xfs_bmap_finish(&args->trans, args->flist, dp);

		if (error) {

			ASSERT(committed);

			args->trans = NULL;

			xfs_bmap_cancel(args->flist);

			goto out;

		}



		/*

		 * bmap_finish() may have committed the last trans and started

		 * a new one.  We need the inode to be in all transactions.

		 */

		if (committed)

			xfs_trans_ijoin(args->trans, dp, 0);



		/*

		 * Commit the Btree join operation and start a new trans.

		 */
@@ -1265,25 +1181,14 @@ xfs_attr_node_removename(xfs_da_args_t *args) 
			xfs_bmap_init(args->flist, args->firstblock);

			error = xfs_attr3_leaf_to_shortform(bp, args, forkoff);

			/* bp is gone due to xfs_da_shrink_inode */

			if (!error) {

			if (!error)

				error = xfs_bmap_finish(&args->trans,

							args->flist,

							&committed);

			}

							args->flist, dp);

			if (error) {

				ASSERT(committed);

				args->trans = NULL;

				xfs_bmap_cancel(args->flist);

				goto out;

			}



			/*

			 * bmap_finish() may have committed the last trans

			 * and started a new one.  We need the inode to be

			 * in all transactions.

			 */

			if (committed)

				xfs_trans_ijoin(args->trans, dp, 0);

		} else

			xfs_trans_brelse(args->trans, bp);

	}

fs/xfs/libxfs/xfs_attr_leaf.c

+1 −0
Original line number Diff line number Diff line
@@ -328,6 +328,7 @@ xfs_attr3_leaf_read_verify( 
}



const struct xfs_buf_ops xfs_attr3_leaf_buf_ops = {

	.name = "xfs_attr3_leaf",

	.verify_read = xfs_attr3_leaf_read_verify,

	.verify_write = xfs_attr3_leaf_write_verify,

};