From: Nikolay Borisov <nborisov@suse.com>
Date: Thu, 2 Jul 2020 13:46:46 +0000 (+0300)
Subject: btrfs: raid56: don't opencode swap() in __raid_recover_end_io
X-Git-Tag: block-5.9-2020-08-14~90^2~34
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=b7d2083a368332b40309c16bb2e7d48ecc920489;p=linux-2.6-block.git

btrfs: raid56: don't opencode swap() in __raid_recover_end_io

Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Signed-off-by: Nikolay Borisov <nborisov@suse.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
---

diff --git a/fs/btrfs/raid56.c b/fs/btrfs/raid56.c
index c09b1c228372..61ff77392357 100644
--- a/fs/btrfs/raid56.c
+++ b/fs/btrfs/raid56.c
@@ -1862,11 +1862,8 @@ static void __raid_recover_end_io(struct btrfs_raid_bio *rbio)
 			}
 
 			/* make sure our ps and qs are in order */
-			if (faila > failb) {
-				int tmp = failb;
-				failb = faila;
-				faila = tmp;
-			}
+			if (faila > failb)
+				swap(faila, failb);
 
 			/* if the q stripe is failed, do a pstripe reconstruction
 			 * from the xors.