Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S966231AbbFJQis (ORCPT ); Wed, 10 Jun 2015 12:38:48 -0400 Received: from mailrelay110.isp.belgacom.be ([195.238.20.137]:7295 "EHLO mailrelay110.isp.belgacom.be" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754328AbbFJQc3 (ORCPT ); Wed, 10 Jun 2015 12:32:29 -0400 X-Belgacom-Dynamic: yes X-Cloudmark-SP-Filtered: true X-Cloudmark-SP-Result: v=1.1 cv=eWtaKQUTUbzTvYESxgzcVvJXO5dQmjbJ/tTWSlQWV0k= c=1 sm=2 a=1AoQrqXK28m10P-3eN4A:9 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: A2C5HgAlZXhV/5QztFtcgxABgTKrcwUBAQEBAQEFAYEEAZJchgmBOj0QAQEBAQEBAYEKQQOEDC8jgRo3iDIB0hGGGYowHYQXBZ8AjUaKNSRiZgFBHBWBPzwxgkcBAQE From: Fabian Frederick To: linux-kernel@vger.kernel.org Cc: Julia Lawall , Fabian Frederick , Oleg Drokin , Andreas Dilger , Greg Kroah-Hartman , HPDD-discuss@ml01.01.org, devel@driverdev.osuosl.org Subject: [PATCH 1/1 linux-next] staging: lustre: lnet: o2iblnd: use swap() in kiblnd_dev_failover() Date: Wed, 10 Jun 2015 18:32:21 +0200 Message-Id: <1433953941-24043-1-git-send-email-fabf@skynet.be> X-Mailer: git-send-email 2.4.2 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1389 Lines: 40 Use kernel.h macro definition. Thanks to Julia Lawall for Coccinelle scripting support. Signed-off-by: Fabian Frederick --- drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c b/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c index a57c5c3..6044337 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()) { -- 2.4.2 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/