diff options
| author | Chris Mason <clm@fb.com> | 2016-07-26 13:07:05 -0700 |
|---|---|---|
| committer | Chris Mason <clm@fb.com> | 2016-07-26 13:07:05 -0700 |
| commit | 023a824f04754a4ed5efc16ee8e41bb932878b0b (patch) | |
| tree | 8ae0bc5a61945bdec42d6c7a929967c548031d5d /fs/btrfs/compression.c | |
| parent | 8b8b08cbfb9021af4b54b4175fc4c51d655aac8c (diff) | |
| parent | 66642832f06a4351e23cea6cf254967c227f8224 (diff) | |
| download | linux-023a824f04754a4ed5efc16ee8e41bb932878b0b.tar.gz linux-023a824f04754a4ed5efc16ee8e41bb932878b0b.tar.bz2 linux-023a824f04754a4ed5efc16ee8e41bb932878b0b.zip | |
Merge branch 'kdave-v4.8' into for-linus-4.8
Diffstat (limited to 'fs/btrfs/compression.c')
| -rw-r--r-- | fs/btrfs/compression.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/fs/btrfs/compression.c b/fs/btrfs/compression.c index 658c39b70fba..7a4d9c81aa2a 100644 --- a/fs/btrfs/compression.c +++ b/fs/btrfs/compression.c @@ -402,7 +402,10 @@ int btrfs_submit_compressed_write(struct inode *inode, u64 start, } ret = btrfs_map_bio(root, WRITE, bio, 0, 1); - BUG_ON(ret); /* -ENOMEM */ + if (ret) { + bio->bi_error = ret; + bio_endio(bio); + } bio_put(bio); @@ -432,7 +435,10 @@ int btrfs_submit_compressed_write(struct inode *inode, u64 start, } ret = btrfs_map_bio(root, WRITE, bio, 0, 1); - BUG_ON(ret); /* -ENOMEM */ + if (ret) { + bio->bi_error = ret; + bio_endio(bio); + } bio_put(bio); return 0; |