From: Guoqing Jiang <gqjiang@suse.com>
Date: Fri, 2 Jun 2017 08:08:50 +0000 (+0800)
Subject: btrfs: simplify code with bio_io_error
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=054ec2f626ed5bc1633addfabb1d8de1b56f949d;p=openwrt%2Fstaging%2Fblogic.git

btrfs: simplify code with bio_io_error

bio_io_error was introduced in the commit 4246a0b63bd8f56a1469b
("block: add a bi_error field to struct bio"), so use it to simplify
code.

Signed-off-by: Guoqing Jiang <gqjiang@suse.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
---

diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index 0a1ec5cd3b8f..4e33c3fded5c 100644
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -8647,8 +8647,7 @@ free_ordered:
 	 * callbacks - they require an allocated dip and a clone of dio_bio.
 	 */
 	if (bio && dip) {
-		bio->bi_error = -EIO;
-		bio_endio(bio);
+		bio_io_error(bio);
 		/*
 		 * The end io callbacks free our dip, do the final put on bio
 		 * and all the cleanup and final put for dio_bio (through