From: Fabian Frederick <fabf@skynet.be>
Date: Wed, 10 Jun 2015 16:32:21 +0000 (+0200)
Subject: staging: lustre: lnet: o2iblnd: use swap() in kiblnd_dev_failover()
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=6d37b171929a94b41214dfabc65881f60c9da095;p=linux-beck.git

staging: lustre: lnet: o2iblnd: use swap() in kiblnd_dev_failover()

Use kernel.h macro definition.

Thanks to Julia Lawall for Coccinelle scripting support.

Signed-off-by: Fabian Frederick <fabf@skynet.be>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c b/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c
index 060b7399e921..2a72427bdd69 100644
--- a/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c
+++ b/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c
@@ -2463,7 +2463,6 @@ int kiblnd_dev_failover(kib_dev_t *dev)
 	LIST_HEAD(zombie_fpo);
 	struct rdma_cm_id *cmid  = NULL;
 	kib_hca_dev_t *hdev  = NULL;
-	kib_hca_dev_t *old;
 	struct ib_pd *pd;
 	kib_net_t *net;
 	struct sockaddr_in addr;
@@ -2555,9 +2554,7 @@ int kiblnd_dev_failover(kib_dev_t *dev)
 
 	write_lock_irqsave(&kiblnd_data.kib_global_lock, flags);
 
-	old = dev->ibd_hdev;
-	dev->ibd_hdev = hdev; /* take over the refcount */
-	hdev = old;
+	swap(dev->ibd_hdev, hdev); /* take over the refcount */
 
 	list_for_each_entry(net, &dev->ibd_nets, ibn_list) {
 		cfs_cpt_for_each(i, lnet_cpt_table()) {