xfs
[Top] [All Lists]

[PATCH] xfs: fix node forward in xfs_node_toosmall

To: xfs@xxxxxxxxxxx
Subject: [PATCH] xfs: fix node forward in xfs_node_toosmall
From: Mark Tinguely <tinguely@xxxxxxx>
Date: Fri, 20 Sep 2013 17:05:08 -0500
Delivered-to: xfs@xxxxxxxxxxx
User-agent: quilt/0.51-1
Commit f5ea1100 cleans up the disk to host conversions for
node directory entries, but because a variable is reused in
xfs_node_toosmall() the next node is not correctly found.
If the original node is small enough (<= 3/8 of the node size),
this change may incorrectly cause a node collapse when it should
not. That will cause an assert in xfstest generic/319:

   Assertion failed: first <= last && last < BBTOB(bp->b_length),
   file: /root/newest/xfs/fs/xfs/xfs_trans_buf.c, line: 569

Keep the original node header to get the correct forward node.

Signed-off-by: Mark Tinguely <tinguely@xxxxxxx>
---
 fs/xfs/xfs_da_btree.c |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

Index: b/fs/xfs/xfs_da_btree.c
===================================================================
--- a/fs/xfs/xfs_da_btree.c
+++ b/fs/xfs/xfs_da_btree.c
@@ -1163,6 +1163,7 @@ xfs_da3_node_toosmall(
        xfs_dablk_t             blkno;
        struct xfs_buf          *bp;
        struct xfs_da3_icnode_hdr nodehdr;
+       struct xfs_da3_icnode_hdr firstnhdr;
        int                     count;
        int                     forward;
        int                     error;
@@ -1221,13 +1222,14 @@ xfs_da3_node_toosmall(
        count -= state->node_ents >> 2;
        count -= nodehdr.count;
 
+       firstnhdr = nodehdr;
        /* start with smaller blk num */
        forward = nodehdr.forw < nodehdr.back;
        for (i = 0; i < 2; forward = !forward, i++) {
                if (forward)
-                       blkno = nodehdr.forw;
+                       blkno = firstnhdr.forw;
                else
-                       blkno = nodehdr.back;
+                       blkno = firstnhdr.back;
                if (blkno == 0)
                        continue;
                error = xfs_da3_node_read(state->args->trans, state->args->dp,


<Prev in Thread] Current Thread [Next in Thread>