diff options
| author | Liu Bo <bo.li.liu@oracle.com> | 2016-06-23 03:32:06 +0200 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2016-07-26 13:52:25 +0200 |
| commit | f5daf2c780f2ddfddbf98f2eb668f026c4dd2e5d (patch) | |
| tree | d8591b80d5797a1cd8ed969b37e3e349417a9c86 | |
| parent | btrfs: make sure device is synced before return (diff) | |
| download | linux-f5daf2c780f2ddfddbf98f2eb668f026c4dd2e5d.tar.xz linux-f5daf2c780f2ddfddbf98f2eb668f026c4dd2e5d.zip | |
Btrfs: fix BUG_ON in btrfs_submit_compressed_write
This is similar to btrfs_submit_compressed_read(), if we fail after
bio is allocated, then we can use bio_endio() and errors are saved
in bio->bi_error. But please note that we don't return errors to
its caller because the caller assumes it won't call endio to cleanup
on error.
Signed-off-by: Liu Bo <bo.li.liu@oracle.com>
Signed-off-by: David Sterba <dsterba@suse.com>
| -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; |