Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Yangtao Li <frank.li@vivo.com>
To:     Jan Kara <jack@suse.com>
Cc:     Yangtao Li <frank.li@vivo.com>, linux-kernel@vger.kernel.org
Subject: [PATCH] quota: add ALLQUOTA macro
Date:   Thu, 13 Apr 2023 23:41:51 +0800
Message-Id: <20230413154151.72935-1-frank.li@vivo.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?Jtp4KFIBTnW623AYsKpWZEwOOy9I60A6IHQZJDwkWuFkMIClkHuV4yqD8FsI?=
 =?us-ascii?Q?ND/uELjxpHvud7QPAPvU5owZAE8FL5qhrGrig+xYTw1+DvO86D2mZ5Zbpc4O?=
 =?us-ascii?Q?Hr/SzCZ/H+qeNdtSaD0VLwhZ5wyO/58f4Y+NG38vsaZt+/k5y6WUWKILEAvK?=
 =?us-ascii?Q?UrJ3be6xPDvFhexZMsVOrkweYlG4oHGOhu0U/jZQeZYOu+GsuQgqR5iUzHvN?=
 =?us-ascii?Q?TFQNytZKnRPN3h+NUl2XlWWrGxc08X0Q5L+hZ4O40hxIOz4edCfRGnJN9Tnq?=
 =?us-ascii?Q?v879OeqOuaUvIpxyhyIcPnofROnRFJ1071A0zXy5aCHNkHKHuuyhc91c/J79?=
 =?us-ascii?Q?vSvPOb1vZyS2vew5c/XzFoioqI+6AvoopEnmYVCyC12qB6ur3KlfPUVswjBb?=
 =?us-ascii?Q?/XZt2YUvq8i0DuKWkQEdMEaEEhdHXmER9dgkskLFFnyW3jt64RUmV0dOWaiK?=
 =?us-ascii?Q?EmdSXeTRPW/tMf993HnxhW1WHatqn4++f0Vfu1QzbOOhalD9xW/R8hEhRuP2?=
 =?us-ascii?Q?d87VqKwaIH4FDR/nBcF3Aja5F97p0vOxlDzcCJXhTDPoUc6axgOaxHrZwOW7?=
 =?us-ascii?Q?CmGDQ4S3KzysvW9wzM5XW0uUv/wn4KBVyfaYc/xDFJONGzilzHVt4NqdLBUp?=
 =?us-ascii?Q?aJs3tiMz/pRccj2KB07WBc/jSVySKbPF4XSZHuLEHHHihLJMWFGXjnmxNJDq?=
 =?us-ascii?Q?pKJzUoI3/8k24l98x+SA2I63C40J+0V5QHFxG3eWIbk7Y21urXBoNHw5rAgk?=
 =?us-ascii?Q?XfAEfZme8gjBbbhbHGmN4HR2a6tPZG1F4Di8DaHCxLr8JBC6iw329w0+OQRI?=
 =?us-ascii?Q?7NcYZG/tdMS9c8Ezc8Roqjy1BktUe3vdBCRvuSttsJqMW/l7SF7oEQgU8kD7?=
 =?us-ascii?Q?2KKiwa7eaazHlzg/vyJd412XfS6l/C63PRyWhZt0EEr4kaDgkid7io1ofa5K?=
 =?us-ascii?Q?JZg3TUtFimHmdCISMzYAAkh9spdemVNdrwdU56Heo6xw0rX1JtgSLb0Ur9ki?=
 =?us-ascii?Q?CVhdUgKkvpMLWyiMF7s+uGWoQrMYRK0EQQJUsVYW+95lzpblYAs6FeImr0y4?=
 =?us-ascii?Q?+oqml53E6FdgTqFL2IexfiOhCn+HxXDnWUVkzdNoEnkWlRmF/N9kcCM04AIe?=
 =?us-ascii?Q?o2Y/nnv9OaKh7ECdy9HZTZt1z+dRh896xsZyHmRJlOiAUodDGo0/4yF7aJYu?=
 =?us-ascii?Q?Z8PvH/SYlxyEXAm1h+vGDeUzeBSe/+dxI9+6waYITKimZouEA/SlpOOxoCbx?=
 =?us-ascii?Q?N7qEsws9xS1EzBXkTY3p3drwMk/b9NuK2IEy0EZ7XoEdeEpe7vCdgW92HDVp?=
 =?us-ascii?Q?eTuy5qvZfUyuxpeeBem9b2J0nLxVL3R3zJixkGeEtt3pR5+iKT+Cuk0pXrRO?=
 =?us-ascii?Q?kdBRo+ib5gmJbDrMBxX3MNpu3qlRV+DW+HPoEas80zgxig4VWx6YbRrn+bIq?=
 =?us-ascii?Q?Oey4n+FoqfEguqk/ZXi72KrukakP7c2NhN1Pmlc5O+pw343qu5r/aR67d0EZ?=
 =?us-ascii?Q?VajBll4RSewfhpVdLADCi0Waxgx3MB1pJQgQ753i38zyXyTL9RO5gV1A/65N?=
 =?us-ascii?Q?1xyb6OrpAhveGxeNXoSAybfs+JVFK/mIbUPisZtK?=
X-OriginatorOrg: vivo.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 2aac1dc0-34b6-47c0-e38a-08db3c35a040
X-MS-Exchange-CrossTenant-AuthSource: SEZPR06MB5269.apcprd06.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Apr 2023 15:42:02.3922
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 923e42dc-48d5-4cbe-b582-1a797a6412ed
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: yVKciuK6nkF2FakCLwyi5fCGPgBhfUSConHe6eUH0Lw9qZFXkhAJ1Xkfx+jpnetjNizP0rq9LypO+u8ULvY2bA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SI2PR06MB4027
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE,
        RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS,URIBL_BLOCKED autolearn=ham
        autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Convert to use macro instead of raw number.

Signed-off-by: Yangtao Li <frank.li@vivo.com>
---
 fs/quota/dquot.c           | 20 ++++++++++----------
 include/uapi/linux/quota.h |  1 +
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/fs/quota/dquot.c b/fs/quota/dquot.c
index 10b46c403bdb..62ee6cb32e57 100644
--- a/fs/quota/dquot.c
+++ b/fs/quota/dquot.c
@@ -640,7 +640,7 @@ int dquot_writeback_dquots(struct super_block *sb, int type)
 	WARN_ON_ONCE(!rwsem_is_locked(&sb->s_umount));
 
 	for (cnt = 0; cnt < MAXQUOTAS; cnt++) {
-		if (type != -1 && cnt != type)
+		if (type != ALLQUOTA && cnt != type)
 			continue;
 		if (!sb_has_quota_active(sb, cnt))
 			continue;
@@ -675,7 +675,7 @@ int dquot_writeback_dquots(struct super_block *sb, int type)
 	}
 
 	for (cnt = 0; cnt < MAXQUOTAS; cnt++)
-		if ((cnt == type || type == -1) && sb_has_quota_active(sb, cnt)
+		if ((cnt == type || type == ALLQUOTA) && sb_has_quota_active(sb, cnt)
 		    && info_dirty(&dqopt->info[cnt]))
 			sb->dq_op->write_info(sb, cnt);
 	dqstats_inc(DQST_SYNCS);
@@ -714,7 +714,7 @@ int dquot_quota_sync(struct super_block *sb, int type)
 	 * that userspace sees the changes.
 	 */
 	for (cnt = 0; cnt < MAXQUOTAS; cnt++) {
-		if (type != -1 && cnt != type)
+		if (type != ALLQUOTA && cnt != type)
 			continue;
 		if (!sb_has_quota_active(sb, cnt))
 			continue;
@@ -948,7 +948,7 @@ static int dqinit_needed(struct inode *inode, int type)
 		return 0;
 
 	dquots = i_dquot(inode);
-	if (type != -1)
+	if (type != ALLQUOTA)
 		return !dquots[type];
 	for (cnt = 0; cnt < MAXQUOTAS; cnt++)
 		if (!dquots[cnt])
@@ -1391,7 +1391,7 @@ static int __dquot_initialize(struct inode *inode, int type)
 		int rc;
 		struct dquot *dquot;
 
-		if (type != -1 && cnt != type)
+		if (type != ALLQUOTA && cnt != type)
 			continue;
 		/*
 		 * The i_dquot should have been initialized in most cases,
@@ -1440,7 +1440,7 @@ static int __dquot_initialize(struct inode *inode, int type)
 	if (IS_NOQUOTA(inode))
 		goto out_lock;
 	for (cnt = 0; cnt < MAXQUOTAS; cnt++) {
-		if (type != -1 && cnt != type)
+		if (type != ALLQUOTA && cnt != type)
 			continue;
 		/* Avoid races with quotaoff() */
 		if (!sb_has_quota_active(sb, cnt))
@@ -1478,7 +1478,7 @@ static int __dquot_initialize(struct inode *inode, int type)
 
 int dquot_initialize(struct inode *inode)
 {
-	return __dquot_initialize(inode, -1);
+	return __dquot_initialize(inode, ALLQUOTA);
 }
 EXPORT_SYMBOL(dquot_initialize);
 
@@ -2131,7 +2131,7 @@ static void vfs_cleanup_quota_inode(struct super_block *sb, int type)
 }
 
 /*
- * Turn quota off on a device. type == -1 ==> quotaoff for all types (umount)
+ * Turn quota off on a device. type == ALLQUOTA ==> quotaoff for all types (umount)
  */
 int dquot_disable(struct super_block *sb, int type, unsigned int flags)
 {
@@ -2158,7 +2158,7 @@ int dquot_disable(struct super_block *sb, int type, unsigned int flags)
 		return 0;
 
 	for (cnt = 0; cnt < MAXQUOTAS; cnt++) {
-		if (type != -1 && cnt != type)
+		if (type != ALLQUOTA && cnt != type)
 			continue;
 		if (!sb_has_quota_loaded(sb, cnt))
 			continue;
@@ -2392,7 +2392,7 @@ int dquot_resume(struct super_block *sb, int type)
 		up_read(&sb->s_umount);
 
 	for (cnt = 0; cnt < MAXQUOTAS; cnt++) {
-		if (type != -1 && cnt != type)
+		if (type != ALLQUOTA && cnt != type)
 			continue;
 		if (!sb_has_quota_suspended(sb, cnt))
 			continue;
diff --git a/include/uapi/linux/quota.h b/include/uapi/linux/quota.h
index f17c9636a859..1707ed43365a 100644
--- a/include/uapi/linux/quota.h
+++ b/include/uapi/linux/quota.h
@@ -38,6 +38,7 @@
 #define __DQUOT_VERSION__	"dquot_6.6.0"
 
 #define MAXQUOTAS 3
+#define ALLQUOTA -1
 #define USRQUOTA  0		/* element used for user quotas */
 #define GRPQUOTA  1		/* element used for group quotas */
 #define PRJQUOTA  2		/* element used for project quotas */
-- 
2.35.1