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

Commit f5ea1100 authored by Dave Chinner's avatar Dave Chinner Committed by Ben Myers
Browse files

xfs: add CRCs to dir2/da node blocks 



Signed-off-by: default avatarDave Chinner <dchinner@redhat.com>
Reviewed-by: default avatarBen Myers <bpm@sgi.com>
Signed-off-by: default avatarBen Myers <bpm@sgi.com>
parent 6b2647a1

fs/xfs/xfs_attr.c

+15 −16
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ 
 * along with this program; if not, write the Free Software Foundation,

 * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA

 */



#include "xfs.h"

#include "xfs_fs.h"

#include "xfs_types.h"
@@ -1236,7 +1235,7 @@ xfs_attr_node_addname(xfs_da_args_t *args) 
	 * Search to see if name already exists, and get back a pointer

	 * to where it should go.

	 */

	error = xfs_da_node_lookup_int(state, &retval);

	error = xfs_da3_node_lookup_int(state, &retval);

	if (error)

		goto out;

	blk = &state->path.blk[ state->path.active-1 ];
@@ -1307,7 +1306,7 @@ xfs_attr_node_addname(xfs_da_args_t *args) 
		 * in the index2/blkno2/rmtblkno2/rmtblkcnt2 fields.

		 */

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

		error = xfs_da_split(state);

		error = xfs_da3_split(state);

		if (!error) {

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

						&committed);
@@ -1329,7 +1328,7 @@ xfs_attr_node_addname(xfs_da_args_t *args) 
		/*

		 * Addition succeeded, update Btree hashvals.

		 */

		xfs_da_fixhashpath(state, &state->path);

		xfs_da3_fixhashpath(state, &state->path);

	}



	/*
@@ -1400,7 +1399,7 @@ xfs_attr_node_addname(xfs_da_args_t *args) 
		state->blocksize = state->mp->m_sb.sb_blocksize;

		state->node_ents = state->mp->m_attr_node_ents;

		state->inleaf = 0;

		error = xfs_da_node_lookup_int(state, &retval);

		error = xfs_da3_node_lookup_int(state, &retval);

		if (error)

			goto out;
@@ -1410,14 +1409,14 @@ xfs_attr_node_addname(xfs_da_args_t *args) 
		blk = &state->path.blk[ state->path.active-1 ];

		ASSERT(blk->magic == XFS_ATTR_LEAF_MAGIC);

		error = xfs_attr_leaf_remove(blk->bp, args);

		xfs_da_fixhashpath(state, &state->path);

		xfs_da3_fixhashpath(state, &state->path);



		/*

		 * Check to see if the tree needs to be collapsed.

		 */

		if (retval && (state->path.active > 1)) {

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

			error = xfs_da_join(state);

			error = xfs_da3_join(state);

			if (!error) {

				error = xfs_bmap_finish(&args->trans,

							args->flist,
@@ -1495,7 +1494,7 @@ xfs_attr_node_removename(xfs_da_args_t *args) 
	/*

	 * Search to see if name exists, and get back a pointer to it.

	 */

	error = xfs_da_node_lookup_int(state, &retval);

	error = xfs_da3_node_lookup_int(state, &retval);

	if (error || (retval != EEXIST)) {

		if (error == 0)

			error = retval;
@@ -1546,14 +1545,14 @@ xfs_attr_node_removename(xfs_da_args_t *args) 
	blk = &state->path.blk[ state->path.active-1 ];

	ASSERT(blk->magic == XFS_ATTR_LEAF_MAGIC);

	retval = xfs_attr_leaf_remove(blk->bp, args);

	xfs_da_fixhashpath(state, &state->path);

	xfs_da3_fixhashpath(state, &state->path);



	/*

	 * Check to see if the tree needs to be collapsed.

	 */

	if (retval && (state->path.active > 1)) {

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

		error = xfs_da_join(state);

		error = xfs_da3_join(state);

		if (!error) {

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

						&committed);
@@ -1699,7 +1698,7 @@ xfs_attr_refillstate(xfs_da_state_t *state) 
	ASSERT((path->active >= 0) && (path->active < XFS_DA_NODE_MAXDEPTH));

	for (blk = path->blk, level = 0; level < path->active; blk++, level++) {

		if (blk->disk_blkno) {

			error = xfs_da_node_read(state->args->trans,

			error = xfs_da3_node_read(state->args->trans,

						state->args->dp,

						blk->blkno, blk->disk_blkno,

						&blk->bp, XFS_ATTR_FORK);
@@ -1718,7 +1717,7 @@ xfs_attr_refillstate(xfs_da_state_t *state) 
	ASSERT((path->active >= 0) && (path->active < XFS_DA_NODE_MAXDEPTH));

	for (blk = path->blk, level = 0; level < path->active; blk++, level++) {

		if (blk->disk_blkno) {

			error = xfs_da_node_read(state->args->trans,

			error = xfs_da3_node_read(state->args->trans,

						state->args->dp,

						blk->blkno, blk->disk_blkno,

						&blk->bp, XFS_ATTR_FORK);
@@ -1758,7 +1757,7 @@ xfs_attr_node_get(xfs_da_args_t *args) 
	/*

	 * Search to see if name exists, and get back a pointer to it.

	 */

	error = xfs_da_node_lookup_int(state, &retval);

	error = xfs_da3_node_lookup_int(state, &retval);

	if (error) {

		retval = error;

	} else if (retval == EEXIST) {
@@ -1810,7 +1809,7 @@ xfs_attr_node_list(xfs_attr_list_context_t *context) 
	 */

	bp = NULL;

	if (cursor->blkno > 0) {

		error = xfs_da_node_read(NULL, context->dp, cursor->blkno, -1,

		error = xfs_da3_node_read(NULL, context->dp, cursor->blkno, -1,

					      &bp, XFS_ATTR_FORK);

		if ((error != 0) && (error != EFSCORRUPTED))

			return(error);
@@ -1852,7 +1851,7 @@ xfs_attr_node_list(xfs_attr_list_context_t *context) 
	if (bp == NULL) {

		cursor->blkno = 0;

		for (;;) {

			error = xfs_da_node_read(NULL, context->dp,

			error = xfs_da3_node_read(NULL, context->dp,

						      cursor->blkno, -1, &bp,

						      XFS_ATTR_FORK);

			if (error)
@@ -1870,7 +1869,7 @@ xfs_attr_node_list(xfs_attr_list_context_t *context) 
				xfs_trans_brelse(NULL, bp);

				return(XFS_ERROR(EFSCORRUPTED));

			}

			btree = node->btree;

			btree = xfs_da3_node_tree_p(node);

			for (i = 0; i < be16_to_cpu(node->hdr.count);

								btree++, i++) {

				if (cursor->hashval

fs/xfs/xfs_attr_leaf.c

+16 −13
Original line number Diff line number Diff line
@@ -910,6 +910,7 @@ xfs_attr_leaf_to_node(xfs_da_args_t *args) 
	struct xfs_buf *bp1, *bp2;

	xfs_dablk_t blkno;

	int error;

	struct xfs_da_node_entry *btree;



	trace_xfs_attr_leaf_to_node(args);
@@ -935,16 +936,16 @@ xfs_attr_leaf_to_node(xfs_da_args_t *args) 
	/*

	 * Set up the new root node.

	 */

	error = xfs_da_node_create(args, 0, 1, &bp1, XFS_ATTR_FORK);

	error = xfs_da3_node_create(args, 0, 1, &bp1, XFS_ATTR_FORK);

	if (error)

		goto out;

	node = bp1->b_addr;

	leaf = bp2->b_addr;

	ASSERT(leaf->hdr.info.magic == cpu_to_be16(XFS_ATTR_LEAF_MAGIC));

	/* both on-disk, don't endian-flip twice */

	node->btree[0].hashval =

		leaf->entries[be16_to_cpu(leaf->hdr.count)-1 ].hashval;

	node->btree[0].before = cpu_to_be32(blkno);

	btree = xfs_da3_node_tree_p(node);

	btree[0].hashval = leaf->entries[be16_to_cpu(leaf->hdr.count)-1 ].hashval;

	btree[0].before = cpu_to_be32(blkno);

	node->hdr.count = cpu_to_be16(1);

	xfs_trans_log_buf(args->trans, bp1, 0, XFS_LBSIZE(dp->i_mount) - 1);

	error = 0;
@@ -1032,7 +1033,7 @@ xfs_attr_leaf_split(xfs_da_state_t *state, xfs_da_state_blk_t *oldblk, 
	 * NOTE: rebalance() currently depends on the 2nd block being empty.

	 */

	xfs_attr_leaf_rebalance(state, oldblk, newblk);

	error = xfs_da_blk_link(state, oldblk, newblk);

	error = xfs_da3_blk_link(state, oldblk, newblk);

	if (error)

		return(error);
@@ -1660,7 +1661,7 @@ xfs_attr_leaf_toosmall(xfs_da_state_t *state, int *action) 
		 */

		forward = (info->forw != 0);

		memcpy(&state->altpath, &state->path, sizeof(state->path));

		error = xfs_da_path_shift(state, &state->altpath, forward,

		error = xfs_da3_path_shift(state, &state->altpath, forward,

						 0, &retval);

		if (error)

			return(error);
@@ -1717,10 +1718,10 @@ xfs_attr_leaf_toosmall(xfs_da_state_t *state, int *action) 
	 */

	memcpy(&state->altpath, &state->path, sizeof(state->path));

	if (blkno < blk->blkno) {

		error = xfs_da_path_shift(state, &state->altpath, forward,

		error = xfs_da3_path_shift(state, &state->altpath, forward,

						 0, &retval);

	} else {

		error = xfs_da_path_shift(state, &state->path, forward,

		error = xfs_da3_path_shift(state, &state->path, forward,

						 0, &retval);

	}

	if (error)
@@ -2783,7 +2784,7 @@ xfs_attr_root_inactive(xfs_trans_t **trans, xfs_inode_t *dp) 
	 * the extents in reverse order the extent containing

	 * block 0 must still be there.

	 */

	error = xfs_da_node_read(*trans, dp, 0, -1, &bp, XFS_ATTR_FORK);

	error = xfs_da3_node_read(*trans, dp, 0, -1, &bp, XFS_ATTR_FORK);

	if (error)

		return(error);

	blkno = XFS_BUF_ADDR(bp);
@@ -2836,6 +2837,7 @@ xfs_attr_node_inactive( 
	xfs_daddr_t parent_blkno, child_blkno;

	int error, count, i;

	struct xfs_buf *child_bp;

	struct xfs_da_node_entry *btree;



	/*

	 * Since this code is recursive (gasp!) we must protect ourselves.
@@ -2853,7 +2855,8 @@ xfs_attr_node_inactive( 
		xfs_trans_brelse(*trans, bp);

		return(0);

	}

	child_fsb = be32_to_cpu(node->btree[0].before);

	btree = xfs_da3_node_tree_p(node);

	child_fsb = be32_to_cpu(btree[0].before);

	xfs_trans_brelse(*trans, bp);	/* no locks for later trans */



	/*
@@ -2868,7 +2871,7 @@ xfs_attr_node_inactive( 
		 * traversal of the tree so we may deal with many blocks

		 * before we come back to this one.

		 */

		error = xfs_da_node_read(*trans, dp, child_fsb, -2, &child_bp,

		error = xfs_da3_node_read(*trans, dp, child_fsb, -2, &child_bp,

						XFS_ATTR_FORK);

		if (error)

			return(error);
@@ -2909,11 +2912,11 @@ xfs_attr_node_inactive( 
		 * child block number.

		 */

		if ((i+1) < count) {

			error = xfs_da_node_read(*trans, dp, 0, parent_blkno,

			error = xfs_da3_node_read(*trans, dp, 0, parent_blkno,

						 &bp, XFS_ATTR_FORK);

			if (error)

				return(error);

			child_fsb = be32_to_cpu(node->btree[i+1].before);

			child_fsb = be32_to_cpu(btree[i+1].before);

			xfs_trans_brelse(*trans, bp);

		}

		/*

fs/xfs/xfs_bmap.c

+1 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
#include "xfs_sb.h"

#include "xfs_ag.h"

#include "xfs_dir2.h"

#include "xfs_mount.h"

#include "xfs_da_btree.h"

#include "xfs_bmap_btree.h"

#include "xfs_alloc_btree.h"