From: "Darrick J. Wong" <darrick.wong@oracle.com>
To: Dave Chinner <david@fromorbit.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
linux-xfs@vger.kernel.org,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Brian Foster <bfoster@redhat.com>
Subject: Re: [PATCH] xfs: fix non-quota build breakage
Date: Tue, 7 Jul 2020 06:57:25 -0700 [thread overview]
Message-ID: <20200707135725.GI7606@magnolia> (raw)
In-Reply-To: <20200707022825.GL2005@dread.disaster.area>
On Tue, Jul 07, 2020 at 12:28:25PM +1000, Dave Chinner wrote:
>
> From: Dave Chinner <dchinner@redhat.com>
>
> Oops, I forgot that you can config out quotas because nobody
> ever does that when they build XFS anymore.
>
> Fixes: 018dc1667913 ("xfs: use direct calls for dquot IO completion")
>
> Signed-off-by: Dave Chinner <dchinner@redhat.com>
Looks ok,
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
--D
> ---
> fs/xfs/xfs_dquot.h | 1 -
> fs/xfs/xfs_quota.h | 9 +++++++++
> 2 files changed, 9 insertions(+), 1 deletion(-)
>
> diff --git a/fs/xfs/xfs_dquot.h b/fs/xfs/xfs_dquot.h
> index fe9cc3e08ed6..71e36c85e20b 100644
> --- a/fs/xfs/xfs_dquot.h
> +++ b/fs/xfs/xfs_dquot.h
> @@ -174,7 +174,6 @@ void xfs_qm_dqput(struct xfs_dquot *dqp);
> void xfs_dqlock2(struct xfs_dquot *, struct xfs_dquot *);
>
> void xfs_dquot_set_prealloc_limits(struct xfs_dquot *);
> -void xfs_dquot_done(struct xfs_buf *);
>
> static inline struct xfs_dquot *xfs_qm_dqhold(struct xfs_dquot *dqp)
> {
> diff --git a/fs/xfs/xfs_quota.h b/fs/xfs/xfs_quota.h
> index aa8fc1f55fbd..c92ae5e02ce8 100644
> --- a/fs/xfs/xfs_quota.h
> +++ b/fs/xfs/xfs_quota.h
> @@ -13,6 +13,7 @@
> */
>
> struct xfs_trans;
> +struct xfs_buf;
>
> /*
> * This check is done typically without holding the inode lock;
> @@ -107,6 +108,8 @@ extern void xfs_qm_mount_quotas(struct xfs_mount *);
> extern void xfs_qm_unmount(struct xfs_mount *);
> extern void xfs_qm_unmount_quotas(struct xfs_mount *);
>
> +void xfs_dquot_done(struct xfs_buf *);
> +
> #else
> static inline int
> xfs_qm_vop_dqalloc(struct xfs_inode *ip, kuid_t kuid, kgid_t kgid,
> @@ -148,6 +151,12 @@ static inline int xfs_trans_reserve_quota_bydquots(struct xfs_trans *tp,
> #define xfs_qm_mount_quotas(mp)
> #define xfs_qm_unmount(mp)
> #define xfs_qm_unmount_quotas(mp)
> +
> +static inline void xfs_dquot_done(struct xfs_buf *bp)
> +{
> + return;
> +}
> +
> #endif /* CONFIG_XFS_QUOTA */
>
> #define xfs_trans_unreserve_quota_nblks(tp, ip, nblks, ninos, flags) \
prev parent reply other threads:[~2020-07-07 13:57 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-07 0:27 linux-next: build failure after merge of the xfs tree Stephen Rothwell
2020-07-07 2:28 ` [PATCH] xfs: fix non-quota build breakage Dave Chinner
2020-07-07 13:57 ` Darrick J. Wong [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=20200707135725.GI7606@magnolia \
--to=darrick.wong@oracle.com \
--cc=bfoster@redhat.com \
--cc=david@fromorbit.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=linux-xfs@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/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;
as well as URLs for NNTP newsgroup(s).