From: Mark Tinguely <tinguely@sgi.com>
To: xfs@oss.sgi.com
Subject: [PATCH] xfs: fix node forward in xfs_node_toosmall
Date: Fri, 20 Sep 2013 17:05:08 -0500 [thread overview]
Message-ID: <20130920220519.585903357@sgi.com> (raw)
[-- Attachment #1: xfs-fix-xfs_da3_node_toosmall-test.patch --]
[-- Type: text/plain, Size: 1670 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>
---
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,
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
next reply other threads:[~2013-09-20 22:06 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-09-20 22:05 Mark Tinguely [this message]
2013-09-23 0:08 ` [PATCH] xfs: fix node forward in xfs_node_toosmall Dave Chinner
2013-09-23 13:38 ` Mark Tinguely
2013-09-23 17:18 ` [PATCH] xfs: v2 " Mark Tinguely
2013-09-23 23:48 ` 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
-- strict thread matches above, loose matches on Subject: below --
2013-10-09 0:09 Ben Myers
2013-10-10 23:02 ` Greg KH
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=20130920220519.585903357@sgi.com \
--to=tinguely@sgi.com \
--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