Эх сурвалжийг харах

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>
Chengguang Xu 7 жил өмнө
parent
commit
891f41cb27

+ 1 - 3
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);
 	ret = btrfs_parse_options(fs_info, data, *flags);
-	if (ret) {
-		ret = -EINVAL;
+	if (ret)
 		goto restore;
 		goto restore;
-	}
 
 
 	btrfs_remount_begin(fs_info, old_opts, *flags);
 	btrfs_remount_begin(fs_info, old_opts, *flags);
 	btrfs_resize_thread_pool(fs_info,
 	btrfs_resize_thread_pool(fs_info,