From patchwork Thu Apr 20 08:03:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carlos Maiolino X-Patchwork-Id: 13218086 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 6931EC7EE22 for ; Thu, 20 Apr 2023 08:04:14 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E363F280003; Thu, 20 Apr 2023 04:04:13 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id D97FF280001; Thu, 20 Apr 2023 04:04:13 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B9C5C280003; Thu, 20 Apr 2023 04:04:13 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id A3F0C280001 for ; Thu, 20 Apr 2023 04:04:13 -0400 (EDT) Received: from smtpin15.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 7D3011601EB for ; Thu, 20 Apr 2023 08:04:13 +0000 (UTC) X-FDA: 80701031586.15.6FD4875 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf05.hostedemail.com (Postfix) with ESMTP id CECAC100009 for ; Thu, 20 Apr 2023 08:04:11 +0000 (UTC) Authentication-Results: imf05.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=mBkZQ1F9; spf=pass (imf05.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=1681977851; 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=FSM2XJx8y8WasXu+0PQ6zrdQAZykzjRiDKiazmEAB08FYnGFqEq0oHmbpGoBmuAGsLzEMM uelf3uBzh45R99RhdRXa3+RKYG077wLsemmI6/Nx/GQOvD5Y9m+Efti1/xzfQjGYzwLaQ4 iPvaus+VUXDhjApKyv6ju9A0kJxCfYo= ARC-Authentication-Results: i=1; imf05.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=mBkZQ1F9; spf=pass (imf05.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=1681977851; a=rsa-sha256; cv=none; b=TuGDW4K2O0054vMJzeBF6qoRsJ1fSw4w8sZ0E2pJhNOwfpriDInNNmNjuoYPYJQpqZ02N3 tTSuX2azSAa1vrUH2NJpW4fSL/k+24kkMtJH9xx3xPho3L6I4VDJt3Fcp5NxPJcrxgZqKP W2cJ/nmhF1ybH7fsL2yxRSJyxR80iBE= 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 ECAAF645C9; Thu, 20 Apr 2023 08:04:10 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id F31E3C4339E; Thu, 20 Apr 2023 08:04:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1681977850; bh=0+8LxOKXGKCvqagfKq127FWqroGkUmeQVQasqMNW7Qw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mBkZQ1F9VgycRDHsoGbYIdJtpqkW9EUk1GP7t6FjuL6HKZv7NZYs7B4nA0uLo2WnL CSFRvDYZeyW8hv+NcwD2Y2x8arQ9PYEbA96I/8de0RT1d7N9KiT+ZQJvukutA3e9ad 02H2Sal8tVnAP2dVSrViq4u28Q4m9fIiuCNe2bfuo0DOK7oeazw4cOXsUHKlKihS2n S2+DHGwkIVVYCJKxC3MXg/XtgaksF232vwGWlfJ1gXvW8rGJoTuweYR+jxZzb/HOs/ FVvMUMKy+s5I1O72wGLNOvxYFHoyQfH+ibXFMqgP8qxP8st113hgaAUypx8yMmRtER wRDRR1RJ1P9Rg== 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: Thu, 20 Apr 2023 10:03:56 +0200 Message-Id: <20230420080359.2551150-4-cem@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230420080359.2551150-1-cem@kernel.org> References: <20230420080359.2551150-1-cem@kernel.org> MIME-Version: 1.0 X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: CECAC100009 X-Stat-Signature: e1smi1xhfundurouwjniq3uc5r5pjeyp X-Rspam-User: X-HE-Tag: 1681977851-850296 X-HE-Meta: U2FsdGVkX19q/kMEvCRQ+KHA6HoYehup0lH+CGtSCF9xJtKKQ45NafXksKPPw81WKOTjXPXXGBKjrT4+d3Rs2UwNwvrnA7SJCxxBBXTNuCvyPgeIMBmtUE8OUOks1BtRENVJ7g3WH/8JIc9XhY3oNn8lYyWrMYzca5r9S72fLs2YBd3KtK7Dduw0KOHFfEZ0CQ2Pildeq0OwsJLEUcxFoC3iXg/GZgHTuB7v9Gv26VrjsjbCWV/xOZWC447sedOfsYY+mcl7Mv/uqe0OrMQzaAgTRCVV8pTD7vDe5LjM/Xd+ds2eImbdkpE6PcyB8Hksna3dxgCyqYqX1T9ntGg0zlMBM1KHb7qDCdsvfPE2PlX4hECwG9syw4mpvjfFKWKF5Ne/QHq9Hie07qYRYj0USyIXFj4pE4xiOADXtCTwSS3RCGnDzgoiHDod+a6F6pd9i/ErqKD/Mf7gd72UGSynYgyKsrUCz1fqd8K0X4+uwAxiVnS4DVe8vxs7JfMpwJ2xi5XVYKgnvWI5rApV793En6B0AF7qHtRvLifPQyDSkVkH50EbyfMAujE7XW/YAlWT0TT4uEqTmWtsYC23M7lI+GjYDnPk5DG4vqLhkM8Nb7gH1Jivxu4zI1qKxO5JXC+qgVN3+n67EZQXA6kko/6Iy/dG1FCCEjw0VolBPBLnzAwNd3LG0+3jI9dXLGBhFnzx8zWlZR1xzGwLDeDcOWqEqN2IraUsnAAcD2ivGTDLu/J2xt90Euc+IKTU1/8AzTYG5/WhsWZ0oRE1ozrZsacQwcyNgL9eWQRDEB7npH4IZn6PmzJVclprxFHlO5SBj02YdaNEOIC3/zvLdLPDfD51navtvZHCKA3Z9Uq/82y1Ko+H87oBGuSFD+0yqY+Jg8eTqom6YstVViRP3tzc2vz4aG3jKGE3qubyDcuwdmBpk1/bBqJ7hJ0LpzvPLLyjqQ4NYEM1AaBKUCe71wGzqUD WhUJq2Xa Oo3SGCALPbxmUpm1PI2OOx6S0Gtj/w6NBJkyFV7Y2GyED5l/oGaEWCp2gbGt63FDGAcInY/HchnPFYevkIl+wMDv5gpStCRB/bauf5w0W4xwBmJtxdpqGN3ex+H0R7R2tR0GLp/pzkehW5LYw6ghtbXc31EixllknHvXiXv8/pKYnW2zNq37Uq1JPkSSa24vhCN0dESWqt/p+r12TMj0mbonhxnfclVvEEmVPvHBBU5lKYN5pEzhsWDmYFKUW5csGLNbkyDImmzCe07lXyPINz4oiQsCsjv7FTYXaTXohtgovmRx5J03Jp9eFvChBRfchBHSoTa7hVOPsdKjUGfy9/F6WOuok3jNSpLbDfB3Q3o3iKKc= 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;