From patchwork Tue Jul 25 14:45:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carlos Maiolino X-Patchwork-Id: 13326568 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 90392C04FDF for ; Tue, 25 Jul 2023 14:45:29 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 2BBC96B0078; Tue, 25 Jul 2023 10:45:29 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 21CC56B007B; Tue, 25 Jul 2023 10:45:29 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0BCE06B007D; Tue, 25 Jul 2023 10:45:29 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id F2B206B0078 for ; Tue, 25 Jul 2023 10:45:28 -0400 (EDT) Received: from smtpin10.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id BA9C040488 for ; Tue, 25 Jul 2023 14:45:28 +0000 (UTC) X-FDA: 81050407536.10.DA75F31 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf26.hostedemail.com (Postfix) with ESMTP id 052CF14001E for ; Tue, 25 Jul 2023 14:45:26 +0000 (UTC) Authentication-Results: imf26.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b="h/x4jyji"; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf26.hostedemail.com: domain of cem@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=cem@kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1690296327; 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=1IAdq4n5/oIzAGmJbwcaTZVO+ZHOV/slhcqGbtISZa0=; b=xO3N0SfmwfICxE0xpVEpCdGZ16fLy5rIP2ObAiig0hT5hwsyxMSxihSxVqe7AdptkbC3yY MKg8XsnnQaUnQKflCbIMm26MWgPr1/lBykGJmslskqt/Ve3QZP62oM02YLfiHNaNMggIMY pyJsfZAmEkbTY68w3I0X8oNUcqaRouQ= ARC-Authentication-Results: i=1; imf26.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b="h/x4jyji"; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf26.hostedemail.com: domain of cem@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=cem@kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1690296327; a=rsa-sha256; cv=none; b=4YfjN0856VKA9CjAHg4lfpI71tQfCTMKR3AYojbvuMweYwa6LWKf/QTXID3fYQigSei2O7 vQ3IvARUr4GbHd9ir6GrD41BuNtX5vb8IYy353EdkaGKEtqNVDPkqChdzZkk6O12vOzV27 YwY66k28A2vAc7zyPw0Y6yXMCrg9Xo8= Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 854D661789; Tue, 25 Jul 2023 14:45:25 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id B7B9DC433CA; Tue, 25 Jul 2023 14:45:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1690296325; bh=okwg5m+9iRcDR+mIe+e593XoCBrrkAftdLKtFY7t22A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=h/x4jyjitGuI2xCFW730+l91R7oGtiojJBNuA+VuT/wXG7VQE3MXHRTPWnwVG4h4d U1Gi1X3u/0A09iYDEDvbBxFwb5m2KWIJUkHQBdH4cVAZoCBtT8hVT70CGESfm/AXxM Ud4H7J+fsycphFQCrW3WJFYQOksPPLakJiqSBPRJ8RTjDs7QXBwIEOLhljPyW0Sh82 Ct/phTEbHj2/9+ZZ872hFKV+vGFXirj+P++EV2uCxSPKTPWVKpCOtIvwwjgefRVZDY xwieeKaGM1qN75kD6v+RE7Wk51Ritya/uS0EFxbzoExfhctyRVoA9IRT96NnkJUktz TzLhFNtjoH3uA== From: cem@kernel.org To: linux-fsdevel@vger.kernel.org Cc: jack@suse.cz, akpm@linux-foundation.org, viro@zeniv.linux.org.uk, linux-mm@kvack.org, djwong@kernel.org, hughd@google.com, brauner@kernel.org, mcgrof@kernel.org Subject: [PATCH 3/7] quota: Check presence of quota operation structures instead of ->quota_read and ->quota_write callbacks Date: Tue, 25 Jul 2023 16:45:06 +0200 Message-Id: <20230725144510.253763-4-cem@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230725144510.253763-1-cem@kernel.org> References: <20230725144510.253763-1-cem@kernel.org> MIME-Version: 1.0 X-Rspamd-Queue-Id: 052CF14001E X-Rspam-User: X-Rspamd-Server: rspam04 X-Stat-Signature: oc6xsc9cdat1ttfjfk1huh3qu44ps6ah X-HE-Tag: 1690296326-848023 X-HE-Meta: U2FsdGVkX1+KGv2XnTvzbi4QeLv18U9Faxn/gn663KOARc8lSjghWZ2tcH+qXjDitDeTG9Tal9F0PMcle1/E7CgM7CTBz8HP+7sfbT2jgCc2wqaODbCpcSkYj2IlQ2Kc0l9XCISgGfaQmjnGk9P8DfYw8lJxQzsoZY9TkbunhqZAONcE1pMWUo2gPErnOteKhfkBL7EEmN7n1pEbkHg6FxfDcfcecbvWFYOoTr0dGTFEcRNar6qnXNNjzJpEs11yGDVv45L7GlxpweLHe9ONJFuIrx/w5xbaTTk6C5pCqh3k1wjtWIqZD5BTujOljCJwLTEoC+rbh14UPF4GnjJELn7cfZMftBR6fQyJwB/nJdHwAhfmPnKBE50dzQcUCYp3OZtmFGW+wPNLV0nNwWO1BOnho7QuoHGxDmwWuki6bj3Ty3hMSVB+Gt0fRE747BGBVDCbkrF/wn2Fl3mfmITvn85S97Y2Ifvwt981Obgtioxu0rJIg5g3JZx6mI+ReFdeex4e81vgAlbnfli+0fO577NeN9faf0w1zXRgVvz3T8R3pR2JKk6yWZLm6tl8YIllGEZeD1JiuUk7vUdqFxloiwsMrPW3X/CVPFWnaSGFPPe+7XomE0fbrBWzTRJ2GGtGIiyXve4eCrJzEXdzYVX6pMYvTJ0YAPU4BvxKM3skNRkqwj84hXbHk5696dyr+SLu7E9dXfuPdS9L4lh0XEmoyK23GPAbKLfdMpUPiECESNZrmvRGt6Vo88+56EBIjg0cjCCQ/5A9hB93mErF1qV5CVM7ViagQ7HxWh248lyReh63C5hSPh9L2iUHm+2MTlW6lR+D/IKSq21kctC6eEUUm7oizOJcmzOYu2iRKQ6hVbmSGswJEMVzWXVgkRf8n4sgg5dzlCm8H4XDGu/tL4MfCRcgKyG4vgd/REFeoGWJqlIhGBVWj2u/ZwcZpZtCImqhWotAy0P2j9Y5gj6cpie RL0HWQ2Y QDbx389xGdHwfbGj5JljDt1FVJTC7m+ikMw6lZOmi5OKk+MbWKVlWATPdBR7dhyV2G1mJdWahX2uMzq7Tohs6ikPTFB+ib72xpZ2bJ2PbRRcdolIv7qLSIQhrx+w4JhmM42kMn3cXjsT2Kh9TFMCXeosqApkHVd0su4/lb0hB6BTdXpioD9TE1PwkbFFstt9QrTomGK80Dyjlm0LlsKO9iZTfEEV+ORXPFojsnGxgLM5FzIlq/H+MEhO6XYsqsUBMfMwwtPhYx2Md6t5p1i1s962AzyPY+yNVpuUvqM28i6Vx0ixCD6BMdAC7t+7CALp3DsSZXsa9XcfDvhOdIqxgDcE51g== 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 e3e4f4047657..4d826c369da2 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;