btrfs: assign error values to the correct bio structs

Junjie Mao · torvalds · commit 14155cafeadd · 2016-10-17T14:16:14.000-07:00
Fixes: 4246a0b ("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>
diff --git 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);
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -698,7 +698,7 @@ int btrfs_submit_compressed_read(struct inode inode, struct bio bio,`
`698`	`698`
`699`	`699`	`ret = btrfs_map_bio(root, comp_bio, mirror_num, 0);`
`700`	`700`	`if (ret) {`
`701`		`- bio->bi_error = ret;`
	`701`	`+ comp_bio->bi_error = ret;`
`702`	`702`	`bio_endio(comp_bio);`
`703`	`703`	`}`
`704`	`704`
`@@ -728,7 +728,7 @@ int btrfs_submit_compressed_read(struct inode inode, struct bio bio,`
`728`	`728`
`729`	`729`	`ret = btrfs_map_bio(root, comp_bio, mirror_num, 0);`
`730`	`730`	`if (ret) {`
`731`		`- bio->bi_error = ret;`
	`731`	`+ comp_bio->bi_error = ret;`
`732`	`732`	`bio_endio(comp_bio);`
`733`	`733`	`}`
`734`	`734`