From: Anand Jain <anand.jain@oracle.com>
Date: Tue, 20 Nov 2018 11:56:16 +0000 (+0800)
Subject: btrfs: don't report user-requested cancel as an error
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=f9085abfaeaf45971044fad2281ffd917cde4526;p=openwrt%2Fstaging%2Fblogic.git

btrfs: don't report user-requested cancel as an error

As of now only user requested replace cancel can cancel the
replace-scrub so no need to log the error.

Signed-off-by: Anand Jain <anand.jain@oracle.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
---

diff --git a/fs/btrfs/dev-replace.c b/fs/btrfs/dev-replace.c
index ead4f3803527..3b272ff60fea 100644
--- a/fs/btrfs/dev-replace.c
+++ b/fs/btrfs/dev-replace.c
@@ -629,7 +629,8 @@ static int btrfs_dev_replace_finishing(struct btrfs_fs_info *fs_info,
 								src_device,
 								tgt_device);
 	} else {
-		btrfs_err_in_rcu(fs_info,
+		if (scrub_ret != -ECANCELED)
+			btrfs_err_in_rcu(fs_info,
 				 "btrfs_scrub_dev(%s, %llu, %s) failed %d",
 				 btrfs_dev_name(src_device),
 				 src_device->devid,