]> git.ipfire.org Git - thirdparty/xfsprogs-dev.git/commitdiff
xfs: ensure we copy buffer type in da btree root splits
authorDave Chinner <dchinner@redhat.com>
Mon, 30 Sep 2013 03:15:17 +0000 (03:15 +0000)
committerRich Johnston <rjohnston@sgi.com>
Thu, 17 Oct 2013 19:46:28 +0000 (14:46 -0500)
When splitting the root of the da btree, we shuffled data between
buffers and the structures that track them. At one point, we copy
data and state from one buffer to another, including the ops
associated with the buffer. When we do this, we also need to copy
the buffer type associated with the buf log item so that the buffer
is logged correctly. If we don't do that, log recovery won't
recognise it and hence it won't recalculate the CRC on the buffer
after recovery. This leads to a directory block that can't be read
after recovery has run.

Found by inspection after finding the same problem with remote
symlink buffers.

Signed-off-by: Dave Chinner <dchinner@redhat.com>
Reviewed-by: Eric Sandeen <sandeen@redhat.com>
Signed-off-by: Rich Johnston <rjohnston@sgi.com>
libxfs/xfs_da_btree.c

index b7b670509a8e7912602a2c9ef392f4aeb0677f37..f106e0665b8bf1a36a47d7e569ad5e20edb0f56a 100644 (file)
@@ -612,6 +612,7 @@ xfs_da3_root_split(
        xfs_trans_log_buf(tp, bp, 0, size - 1);
 
        bp->b_ops = blk1->bp->b_ops;
+       xfs_trans_buf_copy_type(bp, blk1->bp);
        blk1->bp = bp;
        blk1->blkno = blkno;