It's no good to overwrite -ENOMEM using -EINVAL when failing from mount option parsing, so just return original error code.
Signed-off-by: Chengguang Xu <cgxu...@gmx.com> Reviewed-by: David Sterba <dste...@suse.com> Reviewed-by: Qu Wenruo <w...@suse.com> --- v1->v2: - Remove bracket for single line branch. fs/btrfs/super.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c index 0628092..c67fafa 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, -- 1.8.3.1 -- To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html