From: Dave Chinner <david@fromorbit.com>
To: Christoph Hellwig <hch@infradead.org>
Cc: xfs@oss.sgi.com
Subject: Re: [PATCH 1/2] repair: fix the variable-width nlink array
Date: Fri, 2 Mar 2012 20:41:08 +1100 [thread overview]
Message-ID: <20120302094108.GG5091@dastard> (raw)
In-Reply-To: <20120228174223.GA6148@infradead.org>
On Tue, Feb 28, 2012 at 12:42:24PM -0500, Christoph Hellwig wrote:
> It looks like we currently never grow the variable-width nlink array
> if only the on-disk nlink size overflows 8 bits. This leads to a major
> mess in nlink counting, and eventually an assert in phase7.
>
> Replace the indirect all mess with a union that allows doing proper
> array arithmetics while we're at it.
>
> Signed-off-by: Christoph Hellwig <hch@lst.de>
Looks fairly sane to me. I can't see any obvious problems with the
change, though it might be worth adding an overflow warning to the
code:
> + switch (irec->nlink_size) {
> + case sizeof(__uint8_t):
> + if (irec->ino_un.ex_data->counted_nlinks.un8[ino_offset] < 0xff) {
> + irec->ino_un.ex_data->counted_nlinks.un8[ino_offset]++;
> + break;
> + }
> nlink_grow_8_to_16(irec);
> - disk_nlink_16_set(irec, ino_offset, nlinks);
> - } else
> - irec->disk_nlinks[ino_offset] = nlinks;
> + /*FALLTHRU*/
> + case sizeof(__uint16_t):
> + if (irec->ino_un.ex_data->counted_nlinks.un16[ino_offset] < 0xffff) {
> + irec->ino_un.ex_data->counted_nlinks.un16[ino_offset]++;
> + break;
> + }
> + nlink_grow_16_to_32(irec);
> + /*FALLTHRU*/
> + case sizeof(__uint32_t):
> + irec->ino_un.ex_data->counted_nlinks.un32[ino_offset]++;
To check for UINT_MAX before the increment....
> + switch (irec->nlink_size) {
> + case sizeof(__uint8_t):
> + ASSERT(irec->ino_un.ex_data->counted_nlinks.un8[ino_offset] > 0);
> + refs = --irec->ino_un.ex_data->counted_nlinks.un8[ino_offset];
> + break;
> + case sizeof(__uint16_t):
> + ASSERT(irec->ino_un.ex_data->counted_nlinks.un16[ino_offset] > 0);
> + refs = --irec->ino_un.ex_data->counted_nlinks.un16[ino_offset];
> + break;
> + case sizeof(__uint32_t):
> + ASSERT(irec->ino_un.ex_data->counted_nlinks.un32[ino_offset] > 0);
> + refs = --irec->ino_un.ex_data->counted_nlinks.un32[ino_offset];
> + break;
> + default:
> + ASSERT(0);
Similar to the underflow checks here.
Otherwise:
Reviewed-by: Dave Chinner <dchinner@redhat.com>
--
Dave Chinner
david@fromorbit.com
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
prev parent reply other threads:[~2012-03-02 9:41 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-02-28 17:42 [PATCH 1/2] repair: fix the variable-width nlink array Christoph Hellwig
2012-02-28 17:42 ` [PATCH 2/2] repair: fix messages from set_nlinks Christoph Hellwig
2012-03-02 22:09 ` Eric Sandeen
2012-03-01 21:28 ` [PATCH 1/2] repair: fix the variable-width nlink array Ben Myers
2012-03-02 7:44 ` Christoph Hellwig
2012-03-26 17:49 ` Ben Myers
2012-03-27 14:59 ` Christoph Hellwig
2012-03-02 9:41 ` Dave Chinner [this message]
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=20120302094108.GG5091@dastard \
--to=david@fromorbit.com \
--cc=hch@infradead.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.