From: Mark Tinguely <tinguely@sgi.com>
To: xfs@oss.sgi.com, stable@vger.kernel.org
Subject: [PATCH] xfs: v2 fix node forward in xfs_node_toosmall
Date: Mon, 23 Sep 2013 12:18:58 -0500 [thread overview]
Message-ID: <20130923171911.273669684@sgi.com> (raw)
In-Reply-To: 20130920220519.585903357@sgi.com
[-- Attachment #1: v2-xfs-fix-xfs_da3_node_toosmall-test.patch --]
[-- Type: text/plain, Size: 1680 bytes --]
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@sgi.com>
---
v2 -> Dave's local variable approach.
-> send to -stable this bug is in 3.10 and 3.11
fs/xfs/xfs_da_btree.c | 5 +++--
1 file changed, 3 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
@@ -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) {
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
next prev parent reply other threads:[~2013-09-23 18:19 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-09-20 22:05 [PATCH] xfs: fix node forward in xfs_node_toosmall Mark Tinguely
2013-09-23 0:08 ` Dave Chinner
2013-09-23 13:38 ` Mark Tinguely
2013-09-23 17:18 ` Mark Tinguely [this message]
2013-09-23 23:48 ` [PATCH] xfs: v2 " Dave Chinner
2013-09-24 17:35 ` Mark Tinguely
2013-09-24 18:59 ` Ben Myers
2013-09-24 21:06 ` Dave Chinner
2013-09-24 21:34 ` Mark Tinguely
2013-09-24 23:33 ` Dave Chinner
2013-09-25 18:38 ` Ben Myers
2013-09-25 21:03 ` Eric Sandeen
2013-09-25 22:11 ` Ben Myers
2013-09-23 21:34 ` [PATCH] xfs: " Michael L. Semon
2013-09-23 21:45 ` Mark Tinguely
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20130923171911.273669684@sgi.com \
--to=tinguely@sgi.com \
--cc=stable@vger.kernel.org \
--cc=xfs@oss.sgi.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox