diff options
| author | Mark Brown <broonie@kernel.org> | 2018-06-27 14:34:10 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2018-06-27 14:34:10 +0100 |
| commit | eed41b9f413f40183095d27ffc94fb942fe18bb6 (patch) | |
| tree | 0a28112db2410e9ae7586343895079d470121599 /fs/btrfs/inode.c | |
| parent | 698f8bc0bacea1351db9de6f247e6922fb4d7f80 (diff) | |
| parent | 1ce34dea91ae86bb18f493f72292df1bf6f66df7 (diff) | |
Merge branch 'linux-linaro-lsk-v4.14' into linux-linaro-lsk-v4.14-rtlsk-v4.14-18.06-rt
Diffstat (limited to 'fs/btrfs/inode.c')
| -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 8ecbac3b862e..3a07900971c3 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -1027,8 +1027,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, |