From: Kemeng Shi <shikemeng@huaweicloud.com>
Date: Mon, 15 Jul 2024 13:05:34 +0000 (+0800)
Subject: quota: remove unnecessary error code translation in dquot_quota_enable
X-Git-Tag: v6.12-rc1~100^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=edb46ddbc55e53eef3d6e575087baa315598d253;p=thirdparty%2Fkernel%2Flinux.git

quota: remove unnecessary error code translation in dquot_quota_enable

Simply set error code to -EEXIST when quota limit is already enabled in
dquot_quota_enable to remove unnecessary error code translation.

Link: https://patch.msgid.link/20240715130534.2112678-5-shikemeng@huaweicloud.com
Signed-off-by: Kemeng Shi <shikemeng@huaweicloud.com>
Signed-off-by: Jan Kara <jack@suse.cz>
---

diff --git a/fs/quota/dquot.c b/fs/quota/dquot.c
index 156bdd570ef63..30496367d5814 100644
--- a/fs/quota/dquot.c
+++ b/fs/quota/dquot.c
@@ -2594,7 +2594,8 @@ static int dquot_quota_enable(struct super_block *sb, unsigned int flags)
 			goto out_err;
 		}
 		if (sb_has_quota_limits_enabled(sb, type)) {
-			ret = -EBUSY;
+			/* compatible with XFS */
+			ret = -EEXIST;
 			goto out_err;
 		}
 		spin_lock(&dq_state_lock);
@@ -2608,9 +2609,6 @@ out_err:
 		if (flags & qtype_enforce_flag(type))
 			dquot_disable(sb, type, DQUOT_LIMITS_ENABLED);
 	}
-	/* Error code translation for better compatibility with XFS */
-	if (ret == -EBUSY)
-		ret = -EEXIST;
 	return ret;
 }