From patchwork Wed Oct 16 00:41:08 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Kent X-Patchwork-Id: 11192143 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id A91ED1390 for ; Wed, 16 Oct 2019 00:41:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 92E6B20872 for ; Wed, 16 Oct 2019 00:41:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388302AbfJPAl0 (ORCPT ); Tue, 15 Oct 2019 20:41:26 -0400 Received: from icp-osb-irony-out1.external.iinet.net.au ([203.59.1.210]:40358 "EHLO icp-osb-irony-out1.external.iinet.net.au" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390284AbfJPAlY (ORCPT ); Tue, 15 Oct 2019 20:41:24 -0400 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: A2DmAQDRZqZd/0e30XYNWRwBAQEBAQcBAREBBAQBAYF7hDyEJY8zAQEBAQEBBoERih2FIAGEa4cjCQEBAQEBAQEBATcBAYQ7AwICgxI4EwIMAQEBBAEBAQEBBQMBhViGGgIBAyMEUhAYDQImAgJHEAYThXWuB3V/MxqKKYEMKIFlikF4gQeBRIMdhA0cgymCXgSPNjeGPkOWXYIslTYMjhYDix0tijSfHIF6TS4KgydQkEZnjn0BglMBAQ X-IPAS-Result: A2DmAQDRZqZd/0e30XYNWRwBAQEBAQcBAREBBAQBAYF7hDyEJY8zAQEBAQEBBoERih2FIAGEa4cjCQEBAQEBAQEBATcBAYQ7AwICgxI4EwIMAQEBBAEBAQEBBQMBhViGGgIBAyMEUhAYDQImAgJHEAYThXWuB3V/MxqKKYEMKIFlikF4gQeBRIMdhA0cgymCXgSPNjeGPkOWXYIslTYMjhYDix0tijSfHIF6TS4KgydQkEZnjn0BglMBAQ X-IronPort-AV: E=Sophos;i="5.67,301,1566835200"; d="scan'208";a="247444163" Received: from unknown (HELO [192.168.1.222]) ([118.209.183.71]) by icp-osb-irony-out1.iinet.net.au with ESMTP; 16 Oct 2019 08:41:08 +0800 Subject: [PATCH v6 05/12] xfs: dont use XFS_IS_QUOTA_RUNNING() for option check From: Ian Kent To: linux-xfs Cc: Brian Foster , Eric Sandeen , David Howells , Dave Chinner , Al Viro Date: Wed, 16 Oct 2019 08:41:08 +0800 Message-ID: <157118646832.9678.14900204464012668551.stgit@fedora-28> In-Reply-To: <157118625324.9678.16275725173770634823.stgit@fedora-28> References: <157118625324.9678.16275725173770634823.stgit@fedora-28> User-Agent: StGit/unknown-version MIME-Version: 1.0 Sender: linux-xfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-xfs@vger.kernel.org When CONFIG_XFS_QUOTA is not defined any quota option is invalid. Using the macro XFS_IS_QUOTA_RUNNING() as a check if any quota option has been given is a little misleading so use a simple m_qflags != 0 check to make the intended use more explicit. Signed-off-by: Ian Kent Reviewed-by: Darrick J. Wong --- fs/xfs/xfs_super.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/xfs/xfs_super.c b/fs/xfs/xfs_super.c index 5876c2b551b5..f8770206b66e 100644 --- a/fs/xfs/xfs_super.c +++ b/fs/xfs/xfs_super.c @@ -349,7 +349,7 @@ xfs_parseargs( } #ifndef CONFIG_XFS_QUOTA - if (XFS_IS_QUOTA_RUNNING(mp)) { + if (mp->m_qflags != 0) { xfs_warn(mp, "quota support not available in this kernel."); return -EINVAL; }