From: Chengguang Xu <cgxu519@gmx.com>
Date: Wed, 9 May 2018 13:08:23 +0000 (+0800)
Subject: btrfs: return original error code when failing from option parsing
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=891f41cb27cf5036e88053bb0ef688f98fcc945b;p=linux.git

btrfs: return original error code when failing from option parsing

It's not good to overwrite -ENOMEM using -EINVAL when failing from mount
option parsing, so just return original error code.

Signed-off-by: Chengguang Xu <cgxu519@gmx.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Reviewed-by: Qu Wenruo <wqu@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
---

diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c
index 0628092b0b1bd..c67fafaa2fe71 100644
--- a/fs/btrfs/super.c
+++ b/fs/btrfs/super.c
@@ -1782,10 +1782,8 @@ static int btrfs_remount(struct super_block *sb, int *flags, char *data)
 	}
 
 	ret = btrfs_parse_options(fs_info, data, *flags);
-	if (ret) {
-		ret = -EINVAL;
+	if (ret)
 		goto restore;
-	}
 
 	btrfs_remount_begin(fs_info, old_opts, *flags);
 	btrfs_resize_thread_pool(fs_info,