diff options
| author |   Su Yue <suy.fnst@cn.fujitsu.com> | 2018-05-30 16:48:56 +0800 |
|---|---|---|
| committer |   David Sterba <dsterba@suse.com> | 2018-05-30 16:51:08 +0200 |
| commit | 090a127afa8f73e9618d4058d6755f7ec7453dd6 (patch) | |
| tree | 2ca06a315fa51310c4c544963ac9fef5e12079b5 /fs/btrfs | |
| parent | btrfs: drop useless member qgroup_reserved of btrfs_pending_snapshot (diff) | |
| download | linux-dev-090a127afa8f73e9618d4058d6755f7ec7453dd6.tar.xz linux-dev-090a127afa8f73e9618d4058d6755f7ec7453dd6.zip | |
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>
Diffstat (limited to 'fs/btrfs')
| -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, ram_size, /* ram_bytes */ BTRFS_COMPRESS_NONE, /* compress_type */ BTRFS_ORDERED_REGULAR /* type */); - if (IS_ERR(em)) + if (IS_ERR(em)) { + ret = PTR_ERR(em); goto out_reserve; + } free_extent_map(em); ret = btrfs_add_ordered_extent(inode, start, ins.objectid, |