Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753735AbbERROZ (ORCPT ); Mon, 18 May 2015 13:14:25 -0400 Received: from mailrelay116.isp.belgacom.be ([195.238.20.143]:57530 "EHLO mailrelay116.isp.belgacom.be" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752985AbbERROH (ORCPT ); Mon, 18 May 2015 13:14:07 -0400 X-Belgacom-Dynamic: yes X-Cloudmark-SP-Filtered: true X-Cloudmark-SP-Result: v=1.1 cv=Ax9Kd9og7W2htzcJF9odWb+87PP6pPoG1t8Q07ebhfo= c=1 sm=2 a=ScJ-rJVJ8ZMFjLaIajwA:9 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: A2CaDgCOHFpV/4FIiNlcgxCBMrJzBQGBBJhOAoEzPBEBAQEBAQEBgQpBA4NfAQEEJy8jEFE5HhmIMAHYUwErhhaKKQcWhBcFnV+NBYoHI2GDGTwxgkYBAQE From: Fabian Frederick To: linux-kernel@vger.kernel.org Cc: Fabian Frederick , Dave Chinner , xfs@oss.sgi.com Subject: [PATCH 4/4 linux-next] xfs: use swap() in xfs_da3_node_rebalance() Date: Mon, 18 May 2015 19:13:51 +0200 Message-Id: <1431969231-12834-4-git-send-email-fabf@skynet.be> X-Mailer: git-send-email 2.4.0 In-Reply-To: <1431969231-12834-1-git-send-email-fabf@skynet.be> References: <1431969231-12834-1-git-send-email-fabf@skynet.be> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1320 Lines: 38 Use kernel.h macro definition. Signed-off-by: Fabian Frederick --- fs/xfs/libxfs/xfs_da_btree.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/fs/xfs/libxfs/xfs_da_btree.c b/fs/xfs/libxfs/xfs_da_btree.c index 2385f8c..f0101a8 100644 --- a/fs/xfs/libxfs/xfs_da_btree.c +++ b/fs/xfs/libxfs/xfs_da_btree.c @@ -734,7 +734,6 @@ xfs_da3_node_rebalance( { struct xfs_da_intnode *node1; struct xfs_da_intnode *node2; - struct xfs_da_intnode *tmpnode; struct xfs_da_node_entry *btree1; struct xfs_da_node_entry *btree2; struct xfs_da_node_entry *btree_s; @@ -764,9 +763,7 @@ xfs_da3_node_rebalance( ((be32_to_cpu(btree2[0].hashval) < be32_to_cpu(btree1[0].hashval)) || (be32_to_cpu(btree2[nodehdr2.count - 1].hashval) < be32_to_cpu(btree1[nodehdr1.count - 1].hashval)))) { - tmpnode = node1; - node1 = node2; - node2 = tmpnode; + swap(node1, node2); dp->d_ops->node_hdr_from_disk(&nodehdr1, node1); dp->d_ops->node_hdr_from_disk(&nodehdr2, node2); btree1 = dp->d_ops->node_tree_p(node1); -- 2.4.0 -- 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/