From: Zhao Hongjiang <zhaohongjiang@huawei.com>
Date: Tue, 9 Oct 2012 05:48:47 +0000 (+0800)
Subject: ext3: fix return values on parse_options() failure
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=66415f6b50f5bcbc56c78df54aacee73f3d03a3d;p=linux-beck.git

ext3: fix return values on parse_options() failure

parse_options() in ext3 should return 0 when parse the mount options fails.

Signed-off-by: Zhao Hongjiang <zhaohongjiang@huawei.com>
Reviewed-by: Lukas Czerner <lczerner@redhat.com>
Signed-off-by: Jan Kara <jack@suse.cz>
---

diff --git a/fs/ext3/super.c b/fs/ext3/super.c
index 17ae5c83d234..ebf8312c3a4e 100644
--- a/fs/ext3/super.c
+++ b/fs/ext3/super.c
@@ -1001,7 +1001,7 @@ static int parse_options (char *options, struct super_block *sb,
 			uid = make_kuid(current_user_ns(), option);
 			if (!uid_valid(uid)) {
 				ext3_msg(sb, KERN_ERR, "Invalid uid value %d", option);
-				return -1;
+				return 0;
 
 			}
 			sbi->s_resuid = uid;
@@ -1012,7 +1012,7 @@ static int parse_options (char *options, struct super_block *sb,
 			gid = make_kgid(current_user_ns(), option);
 			if (!gid_valid(gid)) {
 				ext3_msg(sb, KERN_ERR, "Invalid gid value %d", option);
-				return -1;
+				return 0;
 			}
 			sbi->s_resgid = gid;
 			break;