From: Dave Chinner <david@fromorbit.com>
To: Roger Willcocks <roger@filmlight.ltd.uk>
Cc: xfs@oss.sgi.com
Subject: Re: [PATCH] v3 inodes are only valid on crc-enabled filesystems.
Date: Sun, 16 Aug 2015 10:42:42 +1000 [thread overview]
Message-ID: <20150816004242.GA3902@dastard> (raw)
In-Reply-To: <C69467E1-642A-422A-8ECF-FDED92550B1B@filmlight.ltd.uk>
On Sun, Aug 16, 2015 at 01:14:55AM +0100, Roger Willcocks wrote:
> Fix an xfs_repair regression reported by Leslie Rhorer where a bad
> (v3) inode version number was not reset.
>
> Signed-off-by: Roger Willcocks <roger@filmlight.ltd.uk>
> ---
> db/check.c | 2 +-
> include/xfs_dinode.h | 3 ++-
> libxfs/xfs_inode_buf.c | 2 +-
> repair/dinode.c | 7 +++----
> repair/prefetch.c | 2 +-
> 5 files changed, 8 insertions(+), 8 deletions(-)
>
> diff --git a/db/check.c b/db/check.c
> index c4c972f..810fa55 100644
> --- a/db/check.c
> +++ b/db/check.c
> @@ -2637,7 +2637,7 @@ process_inode(
> error++;
> return;
> }
> - if (!XFS_DINODE_GOOD_VERSION(idic.di_version)) {
> + if (!XFS_DINODE_GOOD_VERSION(&mp->m_sb, idic.di_version)) {
> if (isfree || v)
> dbprintf(_("bad version number %#x for inode %lld\n"),
> idic.di_version, ino);
> diff --git a/include/xfs_dinode.h b/include/xfs_dinode.h
> index 623bbe8..40700e6 100644
> --- a/include/xfs_dinode.h
> +++ b/include/xfs_dinode.h
> @@ -19,7 +19,8 @@
> #define __XFS_DINODE_H__
>
> #define XFS_DINODE_MAGIC 0x494e /* 'IN' */
> -#define XFS_DINODE_GOOD_VERSION(v) ((v) >= 1 && (v) <= 3)
> +#define XFS_DINODE_GOOD_VERSION(sb, v) \
> + (xfs_sb_version_hascrc(sb) ? ((v) == 3) : ((v) == 1 || (v) == 2))
I'd make this a static inline function so it gets type checking and
it is easier to understand the logic at a glance. i.e. something
like:
static inline bool
xfs_dinode_good_version(struct xfs_mount *mp, __uint8_t version)
{
if (version < 1 || version > 3)
return false;
if (xfs_sb_version_hascrc(&mp->m_sb)) {
if (version != 3)
return false;
} else if (version > 2)
return false;
return true;
}
Otherwise looks fine.
Cheers,
Dave.
--
Dave Chinner
david@fromorbit.com
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
next prev parent reply other threads:[~2015-08-16 0:42 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-08-16 0:14 [PATCH] v3 inodes are only valid on crc-enabled filesystems Roger Willcocks
2015-08-16 0:20 ` Roger Willcocks
2015-08-16 0:42 ` Dave Chinner [this message]
2015-08-16 11:34 ` Roger Willcocks
-- strict thread matches above, loose matches on Subject: below --
2015-08-16 11:34 Roger Willcocks
2015-08-18 0:30 ` Dave Chinner
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=20150816004242.GA3902@dastard \
--to=david@fromorbit.com \
--cc=roger@filmlight.ltd.uk \
--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