Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753410AbbERROJ (ORCPT ); Mon, 18 May 2015 13:14:09 -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 S1751073AbbERROG (ORCPT ); Mon, 18 May 2015 13:14:06 -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=8L3XfnI3w8xBNfFPJTsA:9 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: A2CaDgCOHFpV/4FIiNlcgxCBMrJzBQGBBJhOAoEzPBEBAQEBAQEBgQpBA4NfAQEEJy8jEFE5HhmIMAHYUwEBCCKGFoopBxaEFwWdX40FigcjYYMZPDGCRgEBAQ From: Fabian Frederick To: linux-kernel@vger.kernel.org Cc: Fabian Frederick , Dave Chinner , xfs@oss.sgi.com Subject: [PATCH 3/4 linux-next] xfs: use swap() in xfs_attr3_leaf_rebalance() Date: Mon, 18 May 2015 19:13:50 +0200 Message-Id: <1431969231-12834-3-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: 1122 Lines: 39 Use kernel.h macro definition. Signed-off-by: Fabian Frederick --- fs/xfs/libxfs/xfs_attr_leaf.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/fs/xfs/libxfs/xfs_attr_leaf.c b/fs/xfs/libxfs/xfs_attr_leaf.c index 04e79d5..a346455 100644 --- a/fs/xfs/libxfs/xfs_attr_leaf.c +++ b/fs/xfs/libxfs/xfs_attr_leaf.c @@ -1481,17 +1481,10 @@ xfs_attr3_leaf_rebalance( */ swap = 0; if (xfs_attr3_leaf_order(blk1->bp, &ichdr1, blk2->bp, &ichdr2)) { - struct xfs_da_state_blk *tmp_blk; - struct xfs_attr3_icleaf_hdr tmp_ichdr; - - tmp_blk = blk1; - blk1 = blk2; - blk2 = tmp_blk; + swap(blk1, blk2); /* struct copies to swap them rather than reconverting */ - tmp_ichdr = ichdr1; - ichdr1 = ichdr2; - ichdr2 = tmp_ichdr; + swap(ichdr1, ichdr2); leaf1 = blk1->bp->b_addr; leaf2 = blk2->bp->b_addr; -- 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/