From patchwork Wed Apr 26 10:20:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carlos Maiolino X-Patchwork-Id: 13224373 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9CB93C77B7F for ; Wed, 26 Apr 2023 10:20:23 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 048CB6B00B8; Wed, 26 Apr 2023 06:20:23 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id F3AA36B00B9; Wed, 26 Apr 2023 06:20:22 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C2FDC6B00BA; Wed, 26 Apr 2023 06:20:22 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id B330F6B00B8 for ; Wed, 26 Apr 2023 06:20:22 -0400 (EDT) Received: from smtpin22.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 8D0F0401B0 for ; Wed, 26 Apr 2023 10:20:22 +0000 (UTC) X-FDA: 80723147484.22.262D1F9 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf11.hostedemail.com (Postfix) with ESMTP id E14814001B for ; Wed, 26 Apr 2023 10:20:20 +0000 (UTC) Authentication-Results: imf11.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=fQAOF4ij; spf=pass (imf11.hostedemail.com: domain of cem@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=cem@kernel.org; dmarc=pass (policy=none) header.from=kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1682504420; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=0Bcp8NKJjo7BLV/J1m4qAwfZ3G/eRsQ/n6flfpgnhjE=; b=7MRrBktFBuEq92wvtHH5xT3sCHKAyR+DATXhefC0CfaYp+cmiw1iaq10rjBsfk3R83DB7K /Z+K/Fma4y5sAl6hWSKVHmxlLXPRnKFT/8LyoKFjD+HtOq2w5zsQshivxFQjCATLVSQy76 WEtq6t1wCdPMkUT5hQQ7E69yLmITbuM= ARC-Authentication-Results: i=1; imf11.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=fQAOF4ij; spf=pass (imf11.hostedemail.com: domain of cem@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=cem@kernel.org; dmarc=pass (policy=none) header.from=kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1682504421; a=rsa-sha256; cv=none; b=4Dv5uiiqRmmpKI+5DE0VKfAHdmzGgNVE6zsuiji5zbk/n/0afpEiC9OatzMkZA/LrTPoie GpSZYY286vjKQms6GOe2+UFaQNhHIWs+gOhIztnbzU1ieiWQambv7BWCwIFDztWGex8Ojg pZh8pcL+8tRsca1Px585/r4yb1cXbBQ= Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 2E12C63200; Wed, 26 Apr 2023 10:20:20 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 69754C4339C; Wed, 26 Apr 2023 10:20:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1682504419; bh=0+8LxOKXGKCvqagfKq127FWqroGkUmeQVQasqMNW7Qw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fQAOF4ijN10Rs92SLGh+Nbw4EvoLumPTmPZT5tCintz8fYkrH7WKto9F/dpQya3EQ Sh1CEDBR3XjDlNrbhWdtOn4qb6lMaT9YNlZK/035mKjMotUadoXIqAe3th51WSnwsl lP+hez7gcRjvMJYaaSdB9ILygu/sSPYw55t7d2GkTw9Sil52hHLQjBWHguLbYQYxUR 4aWfUA1seR+9cU/nrULaCpoakoFpr4wxEMBqof0Pd2yP+2e+GEkmRnWv2YK76wMBPt NfZr9eT7AvRDszdK3UJmWAhyv6EOYB8jDkVMq3GYFBPLdgQXaISznDmywK9O7475GV nLJxOz0hYFXkw== From: cem@kernel.org To: hughd@google.com Cc: jack@suse.cz, linux-mm@kvack.org, linux-fsdevel@vger.kernel.org, djwong@kernel.org Subject: [PATCH 3/6] quota: Check presence of quota operation structures instead of ->quota_read and ->quota_write callbacks Date: Wed, 26 Apr 2023 12:20:05 +0200 Message-Id: <20230426102008.2930932-4-cem@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230426102008.2930932-1-cem@kernel.org> References: <20230426102008.2930932-1-cem@kernel.org> MIME-Version: 1.0 X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: E14814001B X-Rspam-User: X-Stat-Signature: 1tsshddq3xiurfrey96oknhr1qqw9u7b X-HE-Tag: 1682504420-309768 X-HE-Meta: U2FsdGVkX1+sU+YJQyNiSQNR+HC7ev9U9CoBW/PeZGuZrZmMf8aufBIUOKGTvytLkAlb8uPQaqq/RKdMpxAES03F135D6u5XSJhV2VksKa9VllIMXafNgFTAvFM1UkLUeKp3U4A9MwXBSBiWnBk50jV2c9QKdQb/Rm49yjtW2npCYJOpirD+t4NWHn2MXs2tvq63+LY8pLSE007+FbWHg2E4Z1c933cpwJsagYHbhEi3VhpVKyKyDjrWgmqJ3ug03lCFoe25/74HrCBjijtI4nWr+5O5HXrl8FjB4mMCRYUJDL7cwyScq5AHrr2UKKs4+j6SJhO6D1e9Shi+Ioj67KbN99v6QedxqBrY7CfX5gZ01ob6PQUepjKxaF45XNOmVf/Qx/RcdyuHKHCcXSZhBgIQ6e3jVQ60WmPMB47pgCp8TNJ9JwYUhh6OLShgO2RbZCGl+/WKKgSBAZSbsMDLC9ThkKzB/rW41PepUHR3K0XL2AEDdIwabeeRffwklXs5SfcRHd24gGecV9CRkrG5/pPx0gbh+ydyOj+97FU0HO6vDvQot7EVsYTuY+3+HYI0S618RaSmxu13Gm3+vYePHNUaKwJYtf5YTCHeYZLhE+DheSkU3lmnzksr7Up4XGTonURs9H/2RPt7Kt0+JoDh0uwjSBLYrUnMVAnaE3yoGPghEIe9ZVUyarUWANB/nWKWywOrzfzhgrHK3uoKHFF2wy4MZXygZUbW24+yPgf/8rJraS0O5IA4YIwEZfxSSOWU0RUx8J4lA7WqCy4QF53uQXdOTZWj2Kif4kQkpITrI1l5xTk5fLlR6YHz1KCiw/Z5IrPHM3byxa3qXM5/x3/PpEZRrjetMXhV6Nz6gqvC/fkT4gOynJXnNaR/e7FngH7YwBf/R0HYZNRTgc88z8Iyw2b4m+uDs5yEwdNVFIsNGGJAOVi6uNoxVyeYOpUkZLYGIcE9OnuZ1QCFgjp/kEH SqgrfHr/ Cyw2EnB8JW0vbHUmORJrjN+wkrpRFuFAABpKxiGgp2E542A3qCRuB6U9QhngRdwZLwIkieMn6HLAepOFSrT3kzr50Lij+qxGVtngKoTrpv5IVUoY1+g3GEcFyO+PyPyo5ZPQzX6DcjgtiFHZ3ZdwtPPg5H7b0rdn8ncQBbsJ0PGfPGcgp8TcEkwH1tUkHGFIFg3e6J+Kh5OLXqJxc/F5QyYDWWqK+VOiufbAEhShaP2P+74nRnD7ji17x6JIMK5v5xTfr9f+h44UGoao50ZbMvOLS0SMohsuaUceDi6iNCa1/3tLiNHZaV3ACIJJnh/4SRHguV9I/vCg9GC5A/mVy8xKBVA== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: From: Jan Kara Currently we check whether superblock has ->quota_read and ->quota_write operations to check whether filesystem supports quotas. However for example for shmfs we will not read or write dquots so check whether quota operations are set in the superblock instead. Signed-off-by: Jan Kara Reviewed-by: Carlos Maiolino --- fs/quota/dquot.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/quota/dquot.c b/fs/quota/dquot.c index a6357f728034a..81563a83b609d 100644 --- a/fs/quota/dquot.c +++ b/fs/quota/dquot.c @@ -2367,7 +2367,7 @@ int dquot_load_quota_sb(struct super_block *sb, int type, int format_id, if (!fmt) return -ESRCH; - if (!sb->s_op->quota_write || !sb->s_op->quota_read || + if (!sb->dq_op || !sb->s_qcop || (type == PRJQUOTA && sb->dq_op->get_projid == NULL)) { error = -EINVAL; goto out_fmt;