From: Ben Myers <bpm@sgi.com>
To: Dave Chinner <david@fromorbit.com>
Cc: xfs@oss.sgi.com
Subject: Re: [PATCH 1/4] xfs: Teach dquot recovery about CONFIG_XFS_QUOTA
Date: Tue, 30 Apr 2013 13:22:03 -0500 [thread overview]
Message-ID: <20130430182203.GK29359@sgi.com> (raw)
In-Reply-To: <1367321976-18268-2-git-send-email-david@fromorbit.com>
On Tue, Apr 30, 2013 at 09:39:33PM +1000, Dave Chinner wrote:
> From: Dave Chinner <dchinner@redhat.com>
>
> Fix a build error when CONFIG_XFS_QUOTA=n:
>
> fs/built-in.o: In function `xlog_recovery_validate_buf_type':
> /home/dave/src/build/x86-64/xfsdev/fs/xfs/xfs_log_recover.c:1948: undefined
> reference to `xfs_dquot_buf_ops'
>
> Reported-by: Michael L. Semon <mlsemon35@gmail.com>
> Signed-off-by: Dave Chinner <dchinner@redhat.com>
Applied fine this time. Must have been a PEBKAC.
Reviewed-by: Ben Myers <bpm@sgi.com>
> ---
> fs/xfs/xfs_log_recover.c | 6 ++++++
> 1 file changed, 6 insertions(+)
>
> diff --git a/fs/xfs/xfs_log_recover.c b/fs/xfs/xfs_log_recover.c
> index 35ac504..ecaa4d4 100644
> --- a/fs/xfs/xfs_log_recover.c
> +++ b/fs/xfs/xfs_log_recover.c
> @@ -1940,12 +1940,18 @@ xlog_recovery_validate_buf_type(
> case XFS_BLFT_UDQUOT_BUF:
> case XFS_BLFT_PDQUOT_BUF:
> case XFS_BLFT_GDQUOT_BUF:
> +#ifdef CONFIG_XFS_QUOTA
> if (magic16 != XFS_DQUOT_MAGIC) {
> xfs_warn(mp, "Bad DQUOT block magic!");
> ASSERT(0);
> break;
> }
> bp->b_ops = &xfs_dquot_buf_ops;
> +#else
> + xfs_alert(mp,
> + "Trying to recover dquots without QUOTA support built in!");
> + ASSERT(0);
Maybe it makes sense for recovery to fail in that case.
-Ben
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
next prev parent reply other threads:[~2013-04-30 18:22 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-04-30 11:39 [PATCH 0/4] xfs: fixes for 3.10 merge window Dave Chinner
2013-04-30 11:39 ` [PATCH 1/4] xfs: Teach dquot recovery about CONFIG_XFS_QUOTA Dave Chinner
2013-04-30 18:22 ` Ben Myers [this message]
2013-04-30 11:39 ` [PATCH 2/4] xfs: introduce CONFIG_XFS_WARN Dave Chinner
2013-05-08 0:02 ` Ben Myers
2013-04-30 11:39 ` [PATCH 3/4] xfs: Remote attr validation fixes and optimisations Dave Chinner
2013-04-30 21:31 ` Ben Myers
2013-04-30 22:16 ` Dave Chinner
2013-04-30 11:39 ` [PATCH 4/4] xfs: fix da node magic number mismatches Dave Chinner
2013-04-30 21:33 ` Ben Myers
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=20130430182203.GK29359@sgi.com \
--to=bpm@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