From patchwork Fri Jun 12 16:59:03 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabian Frederick X-Patchwork-Id: 6599831 Return-Path: X-Original-To: patchwork-ocfs2-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 94A0FC0020 for ; Fri, 12 Jun 2015 17:00:08 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id CAB022068E for ; Fri, 12 Jun 2015 17:00:07 +0000 (UTC) Received: from aserp1040.oracle.com (aserp1040.oracle.com [141.146.126.69]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id D97742068D for ; Fri, 12 Jun 2015 17:00:06 +0000 (UTC) Received: from userv0021.oracle.com (userv0021.oracle.com [156.151.31.71]) by aserp1040.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2) with ESMTP id t5CGxaRX027446 (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 12 Jun 2015 16:59:37 GMT Received: from oss.oracle.com (oss-old-reserved.oracle.com [137.254.22.2]) by userv0021.oracle.com (8.13.8/8.13.8) with ESMTP id t5CGxYvC027172 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Fri, 12 Jun 2015 16:59:35 GMT Received: from localhost ([127.0.0.1] helo=lb-oss.oracle.com) by oss.oracle.com with esmtp (Exim 4.63) (envelope-from ) id 1Z3SIo-0005Qi-HG; Fri, 12 Jun 2015 09:59:34 -0700 Received: from userv0022.oracle.com ([156.151.31.74]) by oss.oracle.com with esmtp (Exim 4.63) (envelope-from ) id 1Z3SIP-0005PZ-WC for ocfs2-devel@oss.oracle.com; Fri, 12 Jun 2015 09:59:10 -0700 Received: from aserp1020.oracle.com (aserp1020.oracle.com [141.146.126.67]) by userv0022.oracle.com (8.13.8/8.13.8) with ESMTP id t5CGx8rs020609 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Fri, 12 Jun 2015 16:59:09 GMT Received: from userp2040.oracle.com (userp2040.oracle.com [156.151.31.90]) by aserp1020.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2) with ESMTP id t5CGx8wO001839 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO) for ; Fri, 12 Jun 2015 16:59:08 GMT Received: from pps.filterd (userp2040.oracle.com [127.0.0.1]) by userp2040.oracle.com (8.14.7/8.14.7) with SMTP id t5CGtPPZ025249 for ; Fri, 12 Jun 2015 16:59:08 GMT Received: from mailrelay108.isp.belgacom.be (mailrelay108.isp.belgacom.be [195.238.20.135]) by userp2040.oracle.com with ESMTP id 1uyw1mn35p-1 for ; Fri, 12 Jun 2015 16:59:07 +0000 X-Belgacom-Dynamic: yes X-Cloudmark-SP-Filtered: true X-Cloudmark-SP-Result: v=1.1 cv=E12Nk8Bf0hMlwhhcPGlCWJx/tbvGdtmOO6CYG/XBrkw= c=1 sm=2 a=G0-y2AMRcQjZBRfdF-sA:9 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: A2DweQDGDntV/zoHQFdcgXKBHgGBMqtVBQEFBQGBBJJghgmBQj0QAQEBAQEBAYEKQQOEOyOBGjeIMwHXGYYZijAdhBcFnxKNToo6JmNmAUEcgVQ8MYJHAQEB Received: from 58.7-64-87.adsl-dyn.isp.belgacom.be (HELO localhost.home.) ([87.64.7.58]) by relay.skynet.be with ESMTP; 12 Jun 2015 18:59:06 +0200 From: Fabian Frederick To: linux-kernel@vger.kernel.org Date: Fri, 12 Jun 2015 18:59:03 +0200 Message-Id: <1434128344-10474-1-git-send-email-fabf@skynet.be> X-Mailer: git-send-email 2.4.2 X-ServerName: mailrelay108.isp.belgacom.be X-Proofpoint-Virus-Version: vendor=nai engine=5700 definitions=7829 signatures=670589 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 kscore.is_bulkscore=2.83235046527608e-10 kscore.compositescore=0 circleOfTrustscore=0 compositescore=0.999906154662021 suspectscore=21 recipient_domain_to_sender_totalscore=0 phishscore=0 bulkscore=0 kscore.is_spamscore=0 rbsscore=0.999906154662021 recipient_to_sender_totalscore=0 recipient_domain_to_sender_domain_totalscore=0 spamscore=0 recipient_to_sender_domain_totalscore=0 urlsuspectscore=0.999906154662021 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=7.0.1-1402240000 definitions=main-1506120292 Cc: Fabian Frederick , Julia Lawall , ocfs2-devel@oss.oracle.com, Mark Fasheh Subject: [Ocfs2-devel] [PATCH 1/1 linux-next] ocfs2: use swap() in dx_leaf_sort_swap() X-BeenThere: ocfs2-devel@oss.oracle.com X-Mailman-Version: 2.1.9 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: ocfs2-devel-bounces@oss.oracle.com Errors-To: ocfs2-devel-bounces@oss.oracle.com X-Source-IP: userv0021.oracle.com [156.151.31.71] X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Use kernel.h macro definition. Thanks to Julia Lawall for Coccinelle scripting support. Signed-off-by: Fabian Frederick --- fs/ocfs2/dir.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/fs/ocfs2/dir.c b/fs/ocfs2/dir.c index a9513ff..ffecf89 100644 --- a/fs/ocfs2/dir.c +++ b/fs/ocfs2/dir.c @@ -3533,13 +3533,10 @@ static void dx_leaf_sort_swap(void *a, void *b, int size) { struct ocfs2_dx_entry *entry1 = a; struct ocfs2_dx_entry *entry2 = b; - struct ocfs2_dx_entry tmp; BUG_ON(size != sizeof(*entry1)); - tmp = *entry1; - *entry1 = *entry2; - *entry2 = tmp; + swap(*entry1, *entry2); } static int ocfs2_dx_leaf_same_major(struct ocfs2_dx_leaf *dx_leaf)