From patchwork Thu Jan 28 06:01:32 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Darrick J. Wong" X-Patchwork-Id: 12051837 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.3 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 58D27C433DB for ; Thu, 28 Jan 2021 06:02:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 220D064DDF for ; Thu, 28 Jan 2021 06:02:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229900AbhA1GCR (ORCPT ); Thu, 28 Jan 2021 01:02:17 -0500 Received: from mail.kernel.org ([198.145.29.99]:37714 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229462AbhA1GCQ (ORCPT ); Thu, 28 Jan 2021 01:02:16 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id 61FC164DDA; Thu, 28 Jan 2021 06:01:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1611813696; bh=qfN7FFdg8lYFkcpiTtv3CuJht7NFQIqoVX4wfyyXBYU=; h=Subject:From:To:Cc:Date:In-Reply-To:References:From; b=gOEULCFXWpjzm+05yb+OAqbUnU2Xhg1avyMkjTjquv5lJxgt2DIj72eZVIlNsfi7c 44PQHGDrvYo92v/GcXPr9mCqBAOcMkfwg/IBAXFXTJ1kooQF1uD1lAENjxPTqhdk7v 5w+9EkiDQuqMKemBV0cIcOJOG6LnGEGMaKQMxkixoDeXCoTH+2NK7kcg4jMxkaG4E1 d/9zd27D7gSNLeE5Yp6dVemhWNRKT/Gj/6nU0S09SYnDqovzftIf18U682my3QsD7I FbZUUJkmhQvqG8UplDuy3rMmMpntUnUmBTtPxTMnyLptYczph3k9xDM1Xnp5wSdiug rtLgu0JKE1cRg== Subject: [PATCH 05/13] xfs: fix up build warnings when quotas are disabled From: "Darrick J. Wong" To: djwong@kernel.org Cc: Christoph Hellwig , linux-xfs@vger.kernel.org, hch@infradead.org, david@fromorbit.com, bfoster@redhat.com Date: Wed, 27 Jan 2021 22:01:32 -0800 Message-ID: <161181369266.1523592.14023535880347018628.stgit@magnolia> In-Reply-To: <161181366379.1523592.9213241916555622577.stgit@magnolia> References: <161181366379.1523592.9213241916555622577.stgit@magnolia> User-Agent: StGit/0.19 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-xfs@vger.kernel.org From: Darrick J. Wong Fix some build warnings on gcc 10.2 when quotas are disabled. Signed-off-by: Darrick J. Wong Reviewed-by: Christoph Hellwig Reviewed-by: Brian Foster --- fs/xfs/xfs_quota.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fs/xfs/xfs_quota.h b/fs/xfs/xfs_quota.h index d1e3f94140b4..72f4cfc49048 100644 --- a/fs/xfs/xfs_quota.h +++ b/fs/xfs/xfs_quota.h @@ -130,7 +130,7 @@ xfs_qm_vop_dqalloc(struct xfs_inode *ip, kuid_t kuid, kgid_t kgid, } #define xfs_trans_dup_dqinfo(tp, tp2) #define xfs_trans_free_dqinfo(tp) -#define xfs_trans_mod_dquot_byino(tp, ip, fields, delta) +#define xfs_trans_mod_dquot_byino(tp, ip, fields, delta) do { } while (0) #define xfs_trans_apply_dquot_deltas(tp) #define xfs_trans_unreserve_and_mod_dquots(tp) static inline int xfs_trans_reserve_quota_nblks(struct xfs_trans *tp, @@ -166,8 +166,8 @@ xfs_trans_reserve_quota_icreate(struct xfs_trans *tp, struct xfs_dquot *udqp, #define xfs_qm_dqattach(ip) (0) #define xfs_qm_dqattach_locked(ip, fl) (0) #define xfs_qm_dqdetach(ip) -#define xfs_qm_dqrele(d) -#define xfs_qm_statvfs(ip, s) +#define xfs_qm_dqrele(d) do { (d) = (d); } while(0) +#define xfs_qm_statvfs(ip, s) do { } while(0) #define xfs_qm_newmount(mp, a, b) (0) #define xfs_qm_mount_quotas(mp) #define xfs_qm_unmount(mp)