From 86d9edc17d3b428d72f5515f0129f53d089ffcff Mon Sep 17 00:00:00 2001
From: Zhao Hongjiang <zhaohongjiang@huawei.com>
Date: Tue, 9 Oct 2012 13:44:36 +0800
Subject: [PATCH] --- yaml --- r: 334374 b: refs/heads/master c:
 ae2cf4284e198684cad8f654923dd8062ee46f88 h: refs/heads/master v: v3

---
 [refs]                | 2 +-
 trunk/fs/ext2/super.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 3d63c365313f..9e6760506eb0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c3d59ad6ab0b3d01c10f326bbc9b089424a3a5c4
+refs/heads/master: ae2cf4284e198684cad8f654923dd8062ee46f88
diff --git a/trunk/fs/ext2/super.c b/trunk/fs/ext2/super.c
index 6c205d0c565b..fa04d023177e 100644
--- a/trunk/fs/ext2/super.c
+++ b/trunk/fs/ext2/super.c
@@ -469,7 +469,7 @@ static int parse_options(char *options, struct super_block *sb)
 			uid = make_kuid(current_user_ns(), option);
 			if (!uid_valid(uid)) {
 				ext2_msg(sb, KERN_ERR, "Invalid uid value %d", option);
-				return -1;
+				return 0;
 
 			}
 			sbi->s_resuid = uid;
@@ -480,7 +480,7 @@ static int parse_options(char *options, struct super_block *sb)
 			gid = make_kgid(current_user_ns(), option);
 			if (!gid_valid(gid)) {
 				ext2_msg(sb, KERN_ERR, "Invalid gid value %d", option);
-				return -1;
+				return 0;
 			}
 			sbi->s_resgid = gid;
 			break;