From: Mark Tinguely <tinguely@sgi.com>
To: Dave Chinner <david@fromorbit.com>
Cc: xfs@oss.sgi.com
Subject: Re: [PATCH] xfs: fix node forward in xfs_node_toosmall
Date: Mon, 23 Sep 2013 08:38:16 -0500 [thread overview]
Message-ID: <52404448.7040800@sgi.com> (raw)
In-Reply-To: <20130923000824.GK12541@dastard>
On 09/22/13 19:08, Dave Chinner wrote:
> On Fri, Sep 20, 2013 at 05:05:08PM -0500, Mark Tinguely wrote:
>> 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>
>> ---
...
> Yes, that definitely a bug, but I think that the change doesn't
> scope correctly. The original node header doesn't need to be saved
> like this - the node header decoded in the loop needs a loop-scope
> variable. i.e.:
>
> /* 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
> blkno = nodehdr.back;
> if (blkno == 0)
> continue;
> error = xfs_da3_node_read(state->args->trans, state->args->dp,
> blkno, -1,&bp, state->args->whichfork);
> if (error)
> 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 */
> }
>
> Cheers,
>
> Dave.
Okay thanks.
--Mark.
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
next prev parent reply other threads:[~2013-09-23 13:38 UTC|newest]
Thread overview: 17+ 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 [this message]
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=52404448.7040800@sgi.com \
--to=tinguely@sgi.com \
--cc=david@fromorbit.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