summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJunjie Mao <junjie.mao@enight.me>2016-10-17 09:20:25 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-10-22 12:06:47 +0200
commit21fe8c7da71620f52fefef1cac94cc2180502d75 (patch)
tree504f793dcfbd64a61e9e50b9ee243eaada95b8f9
parent56a17dd9eab1ea323f86adcbb05672369f63f8fa (diff)
downloadlinux-stable-21fe8c7da71620f52fefef1cac94cc2180502d75.tar.gz
linux-stable-21fe8c7da71620f52fefef1cac94cc2180502d75.tar.bz2
linux-stable-21fe8c7da71620f52fefef1cac94cc2180502d75.zip
btrfs: assign error values to the correct bio structs
commit 14155cafeadda946376260e2ad5d39a0528a332f upstream. Fixes: 4246a0b63bd8 ("block: add a bi_error field to struct bio") Signed-off-by: Junjie Mao <junjie.mao@enight.me> Acked-by: David Sterba <dsterba@suse.cz> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--fs/btrfs/compression.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/btrfs/compression.c b/fs/btrfs/compression.c
index 658c39b70fba..702e5834f110 100644
--- a/fs/btrfs/compression.c
+++ b/fs/btrfs/compression.c
@@ -690,7 +690,7 @@ int btrfs_submit_compressed_read(struct inode *inode, struct bio *bio,
ret = btrfs_map_bio(root, READ, comp_bio,
mirror_num, 0);
if (ret) {
- bio->bi_error = ret;
+ comp_bio->bi_error = ret;
bio_endio(comp_bio);
}
@@ -719,7 +719,7 @@ int btrfs_submit_compressed_read(struct inode *inode, struct bio *bio,
ret = btrfs_map_bio(root, READ, comp_bio, mirror_num, 0);
if (ret) {
- bio->bi_error = ret;
+ comp_bio->bi_error = ret;
bio_endio(comp_bio);
}