summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorJunjie Mao <junjie.mao@enight.me>2016-10-17 03:20:25 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2016-10-17 23:16:14 +0200
commit14155cafeadda946376260e2ad5d39a0528a332f (patch)
treefb2197aa508fb8a6ad92cd90518e1d8248fa28b0 /fs
parentx86, pkeys: remove cruft from never-merged syscalls (diff)
downloadlinux-14155cafeadda946376260e2ad5d39a0528a332f.tar.xz
linux-14155cafeadda946376260e2ad5d39a0528a332f.zip
btrfs: assign error values to the correct bio structs
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> Cc: stable@vger.kernel.org # 4.3+ Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs')
-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 ccc70d96958d..d4d8b7e36b2f 100644
--- a/fs/btrfs/compression.c
+++ b/fs/btrfs/compression.c
@@ -698,7 +698,7 @@ int btrfs_submit_compressed_read(struct inode *inode, struct bio *bio,
ret = btrfs_map_bio(root, comp_bio, mirror_num, 0);
if (ret) {
- bio->bi_error = ret;
+ comp_bio->bi_error = ret;
bio_endio(comp_bio);
}
@@ -728,7 +728,7 @@ int btrfs_submit_compressed_read(struct inode *inode, struct bio *bio,
ret = btrfs_map_bio(root, comp_bio, mirror_num, 0);
if (ret) {
- bio->bi_error = ret;
+ comp_bio->bi_error = ret;
bio_endio(comp_bio);
}