From: Yangtao Li <frank.li@vivo.com>
Date: Mon, 27 Feb 2023 12:02:15 +0000 (+0800)
Subject: quota: fixup *_write_file_info() to return proper error code
X-Git-Tag: v6.6.7~3009^2~7
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f8107c996f5419a5b964b9796d736c7b81f099a0;p=platform%2Fkernel%2Flinux-starfive.git

quota: fixup *_write_file_info() to return proper error code

For v1_write_file_info function, when quota_write() returns 0,
it should be considered an EIO error. And for v2_write_file_info(),
fix to proper error return code instead of raw number.

Signed-off-by: Yangtao Li <frank.li@vivo.com>
Signed-off-by: Jan Kara <jack@suse.cz>
Message-Id: <20230227120216.31306-1-frank.li@vivo.com>
---

diff --git a/fs/quota/quota_v1.c b/fs/quota/quota_v1.c
index cd92e5f..a0db3f1 100644
--- a/fs/quota/quota_v1.c
+++ b/fs/quota/quota_v1.c
@@ -206,7 +206,7 @@ static int v1_write_file_info(struct super_block *sb, int type)
 	      sizeof(struct v1_disk_dqblk), v1_dqoff(0));
 	if (ret == sizeof(struct v1_disk_dqblk))
 		ret = 0;
-	else if (ret > 0)
+	else if (ret >= 0)
 		ret = -EIO;
 out:
 	up_write(&dqopt->dqio_sem);
diff --git a/fs/quota/quota_v2.c b/fs/quota/quota_v2.c
index b1467f3..ae99e7b 100644
--- a/fs/quota/quota_v2.c
+++ b/fs/quota/quota_v2.c
@@ -212,7 +212,7 @@ static int v2_write_file_info(struct super_block *sb, int type)
 	up_write(&dqopt->dqio_sem);
 	if (size != sizeof(struct v2_disk_dqinfo)) {
 		quota_error(sb, "Can't write info structure");
-		return -1;
+		return size < 0 ? size : -EIO;
 	}
 	return 0;
 }