Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754247AbbERRYj (ORCPT ); Mon, 18 May 2015 13:24:39 -0400 Received: from mailrelay116.isp.belgacom.be ([195.238.20.143]:61359 "EHLO mailrelay116.isp.belgacom.be" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752079AbbERRYh (ORCPT ); Mon, 18 May 2015 13:24:37 -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=YwlOPcsz20smdlzw5mYA:9 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: A2CgDgAFIFpV/4FIiNlcgxCBMrJ1BQGBBJhIBAICgTQ8EQEBAQEBAQGBCkEDg18BAQQnLyMQUTkeGYgwAdhfASuGFoopBxaEFwEEnV+NBYoHI2GDGTwxgkYBAQE From: Fabian Frederick To: linux-kernel@vger.kernel.org Cc: Fabian Frederick , Chris Mason , Josef Bacik , David Sterba , linux-btrfs@vger.kernel.org Subject: [PATCH 2/2 linux-next] btrfs: use swap() in merge_ref() Date: Mon, 18 May 2015 19:24:13 +0200 Message-Id: <1431969853-14700-2-git-send-email-fabf@skynet.be> X-Mailer: git-send-email 2.4.0 In-Reply-To: <1431969853-14700-1-git-send-email-fabf@skynet.be> References: <1431969853-14700-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: 889 Lines: 32 Use kernel.h macro definition. Signed-off-by: Fabian Frederick --- fs/btrfs/delayed-ref.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/fs/btrfs/delayed-ref.c b/fs/btrfs/delayed-ref.c index 8f8ed7d..97c5a19 100644 --- a/fs/btrfs/delayed-ref.c +++ b/fs/btrfs/delayed-ref.c @@ -301,11 +301,7 @@ static int merge_ref(struct btrfs_trans_handle *trans, mod = next->ref_mod; } else { if (ref->ref_mod < next->ref_mod) { - struct btrfs_delayed_ref_node *tmp; - - tmp = ref; - ref = next; - next = tmp; + swap(ref, next); done = 1; } mod = -next->ref_mod; -- 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/