diff options
author | Su Yue <suy.fnst@cn.fujitsu.com> | 2018-05-30 04:48:56 -0400 |
---|---|---|
committer | David Sterba <dsterba@suse.com> | 2018-05-30 10:51:08 -0400 |
commit | 090a127afa8f73e9618d4058d6755f7ec7453dd6 (patch) | |
tree | 2ca06a315fa51310c4c544963ac9fef5e12079b5 | |
parent | 6b0cb1f90147908f7d85dd15e4dec56c8b6b632f (diff) |
btrfs: return error value if create_io_em failed in cow_file_range
In cow_file_range(), create_io_em() may fail, but its return value is
not recorded. Then return value may be 0 even it failed which is a
wrong behavior.
Let cow_file_range() return PTR_ERR(em) if create_io_em() failed.
Fixes: 6f9994dbabe5 ("Btrfs: create a helper to create em for IO")
CC: stable@vger.kernel.org # 4.11+
Signed-off-by: Su Yue <suy.fnst@cn.fujitsu.com>
Reviewed-by: Nikolay Borisov <nborisov@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
-rw-r--r-- | fs/btrfs/inode.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index 7148abaf1da3..f81a48c47fe0 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c | |||
@@ -1018,8 +1018,10 @@ static noinline int cow_file_range(struct inode *inode, | |||
1018 | ram_size, /* ram_bytes */ | 1018 | ram_size, /* ram_bytes */ |
1019 | BTRFS_COMPRESS_NONE, /* compress_type */ | 1019 | BTRFS_COMPRESS_NONE, /* compress_type */ |
1020 | BTRFS_ORDERED_REGULAR /* type */); | 1020 | BTRFS_ORDERED_REGULAR /* type */); |
1021 | if (IS_ERR(em)) | 1021 | if (IS_ERR(em)) { |
1022 | ret = PTR_ERR(em); | ||
1022 | goto out_reserve; | 1023 | goto out_reserve; |
1024 | } | ||
1023 | free_extent_map(em); | 1025 | free_extent_map(em); |
1024 | 1026 | ||
1025 | ret = btrfs_add_ordered_extent(inode, start, ins.objectid, | 1027 | ret = btrfs_add_ordered_extent(inode, start, ins.objectid, |