aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLiu Bo <bo.li.liu@oracle.com>2016-06-22 21:32:06 -0400
committerDavid Sterba <dsterba@suse.com>2016-07-26 07:52:25 -0400
commitf5daf2c780f2ddfddbf98f2eb668f026c4dd2e5d (patch)
treed8591b80d5797a1cd8ed969b37e3e349417a9c86
parente2bf6e89b4c71ea08223f13a700cfd0b576f7e7a (diff)
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.c10
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,
402 } 402 }
403 403
404 ret = btrfs_map_bio(root, WRITE, bio, 0, 1); 404 ret = btrfs_map_bio(root, WRITE, bio, 0, 1);
405 BUG_ON(ret); /* -ENOMEM */ 405 if (ret) {
406 bio->bi_error = ret;
407 bio_endio(bio);
408 }
406 409
407 bio_put(bio); 410 bio_put(bio);
408 411
@@ -432,7 +435,10 @@ int btrfs_submit_compressed_write(struct inode *inode, u64 start,
432 } 435 }
433 436
434 ret = btrfs_map_bio(root, WRITE, bio, 0, 1); 437 ret = btrfs_map_bio(root, WRITE, bio, 0, 1);
435 BUG_ON(ret); /* -ENOMEM */ 438 if (ret) {
439 bio->bi_error = ret;
440 bio_endio(bio);
441 }
436 442
437 bio_put(bio); 443 bio_put(bio);
438 return 0; 444 return 0;