xfs: fix node forward in xfs_node_toosmall
PATCH 1/1 xfs: fix node forward in xfs_node_toosmall
From: Mark Tinguely <[email protected]>
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.
(When a node is considered for a merge with a sibling, it overwrites the
sibling pointers of the original incore nodehdr with the sibling's pointers. This leads to loop considering the original node as a merge candidate with itself in the second pass, and so it incorrectly determines a merge should occur.)
upstream commit 997def25e4b9cee3b01609e18a52f926bca8bd2b
[v3: added Dave Chinner's (slightly modified) suggestion to the commit header,
cleaned up whitespace. -bpm]
---
Hi Stable Folk,
Please take this commit for stable branches back to 3.10. This fixes a bug in XFS directory code.
Thanks,
Ben
fs/xfs/xfs_da_btree.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
fs/xfs/xfs_da_btree.c +3 -2
@@ -1224,6 +1224,7 @@ xfs_da3_node_toosmall(/* start with smaller blk num */ forward = nodehdr.forw < nodehdr.back;for (i =0 ; i <2 ; forward = !forward, i++) { +struct xfs_da3_icnode_hdr thdr;if (forward) blkno = nodehdr.forw;else
@@ -1236,10 +1237,10 @@ xfs_da3_node_toosmall(return (error); node = bp->b_addr; -xfs_da3_node_hdr_from_disk (&nodehdr, node); +xfs_da3_node_hdr_from_disk (&thdr, node);xfs_trans_brelse (state->args->trans, bp); -if (count - nodehdr.count >=0 ) +if (count - thdr.count >=0 )break ;/* fits with at least 25% to spare */ }if (i >=2 ) {
Signature · 6 lines
1.7.12.4 _______________________________________________ xfs mailing list [email protected] http://oss.sgi.com/mailman/listinfo/xfs
Greg KH
AppliedQuoted 14 lines · Ben Myers
From: Mark Tinguely <[email protected]>
Commit
f5ea1100cleans up the disk to host conversions for node directory entries, but because a variable is reused inxfs_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: 569Keep the original node header to get the correct forward node.
Quoted 7 lines
(When a node is considered for a merge with a sibling, it overwrites the
sibling pointers of the original incore nodehdr with the sibling's pointers. This leads to loop considering the original node as a merge candidate with itself in the second pass, and so it incorrectly determines a merge should occur.)upstream commit
997def25e4b9cee3b01609e18a52f926bca8bd2b
Applied to the 3.10 and 3.11 stable queues, thanks.
greg k-h
_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs