xfs: fully initialise temp leaf in xfs_attr3_leaf_unbalance (8517de2a) · Commits · 戴 / test

xfs_attr3_leaf_unbalance() uses a temporary buffer for recombining the entries in two leaves when the destination leaf requires compaction. The temporary buffer ends up being copied back over the original destination buffer, so the header in the temporary buffer needs to contain all the information that is in the destination buffer. To make sure the temporary buffer is fully initialised, once we've set up the temporary incore header appropriately, write is back to the temporary buffer before starting to move entries around. Signed-off-by:

Dave Chinner <dchinner@redhat.com> Reviewed-by:

Ben Myers <bpm@sgi.com> Signed-off-by:

Ben Myers <bpm@sgi.com>

fs/xfs/xfs_attr_leaf.c

+13 −3

Original line number	Diff line number	Diff line
		@@ -2181,14 +2181,24 @@ xfs_attr3_leaf_unbalance(
		struct xfs_attr_leafblock *tmp_leaf;
		struct xfs_attr3_icleaf_hdr tmphdr;

		tmp_leaf = kmem_alloc(state->blocksize, KM_SLEEP);
		memset(tmp_leaf, 0, state->blocksize);
		memset(&tmphdr, 0, sizeof(tmphdr));
		tmp_leaf = kmem_zalloc(state->blocksize, KM_SLEEP);

		/*
		* Copy the header into the temp leaf so that all the stuff
		* not in the incore header is present and gets copied back in
		* once we've moved all the entries.
		*/
		memcpy(tmp_leaf, save_leaf, xfs_attr3_leaf_hdr_size(save_leaf));

		memset(&tmphdr, 0, sizeof(tmphdr));
		tmphdr.magic = savehdr.magic;
		tmphdr.forw = savehdr.forw;
		tmphdr.back = savehdr.back;
		tmphdr.firstused = state->blocksize;

		/* write the header to the temp buffer to initialise it */
		xfs_attr3_leaf_hdr_to_disk(tmp_leaf, &tmphdr);

		if (xfs_attr3_leaf_order(save_blk->bp, &savehdr,
		drop_blk->bp, &drophdr)) {
		xfs_attr3_leaf_moveents(drop_leaf, &drophdr, 0,

Admin message