From patchwork Fri Aug 7 07:59:29 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrzej Hajda X-Patchwork-Id: 7025711 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 EF24FC05AD for ; Mon, 17 Aug 2015 16:06:51 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 03667205FA for ; Mon, 17 Aug 2015 16:06:51 +0000 (UTC) Received: from userp1040.oracle.com (userp1040.oracle.com [156.151.31.81]) (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 AAFFB2047C for ; Mon, 17 Aug 2015 16:06:48 +0000 (UTC) Received: from userv0022.oracle.com (userv0022.oracle.com [156.151.31.74]) by userp1040.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2) with ESMTP id t7HG623g015374 (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 17 Aug 2015 16:06:04 GMT Received: from oss.oracle.com (oss-old-reserved.oracle.com [137.254.22.2]) by userv0022.oracle.com (8.13.8/8.13.8) with ESMTP id t7HG5xvW002444 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Mon, 17 Aug 2015 16:05:59 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 1ZRMv9-00072D-1G; Mon, 17 Aug 2015 09:05:59 -0700 Received: from userv0021.oracle.com ([156.151.31.71]) by oss.oracle.com with esmtp (Exim 4.63) (envelope-from ) id 1ZNcaA-0002ua-De for ocfs2-devel@oss.oracle.com; Fri, 07 Aug 2015 01:00:50 -0700 Received: from aserp1030.oracle.com (aserp1030.oracle.com [141.146.126.68]) by userv0021.oracle.com (8.13.8/8.13.8) with ESMTP id t7780n1Z010324 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Fri, 7 Aug 2015 08:00:49 GMT Received: from userp2030.oracle.com (userp2030.oracle.com [156.151.31.89]) by aserp1030.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2) with ESMTP id t7780mC2023325 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO) for ; Fri, 7 Aug 2015 08:00:48 GMT Received: from pps.filterd (userp2030.oracle.com [127.0.0.1]) by userp2030.oracle.com (8.15.0.59/8.15.0.59) with SMTP id t777w3ix011628 for ; Fri, 7 Aug 2015 08:00:48 GMT Received: from mailout3.w1.samsung.com (mailout3.w1.samsung.com [210.118.77.13]) by userp2030.oracle.com with ESMTP id 1w4q3x1rnd-1 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES128-SHA bits=128 verify=NOT) for ; Fri, 07 Aug 2015 08:00:48 +0000 Received: from eucpsbgm1.samsung.com (unknown [203.254.199.244]) by mailout3.w1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTP id <0NSP00E6QCX8C740@mailout3.w1.samsung.com> for ocfs2-devel@oss.oracle.com; Fri, 07 Aug 2015 09:00:44 +0100 (BST) X-AuditID: cbfec7f4-f79c56d0000012ee-af-55c465ac7c00 Received: from eusync2.samsung.com ( [203.254.199.212]) by eucpsbgm1.samsung.com (EUCPMTA) with SMTP id 3D.94.04846.CA564C55; Fri, 7 Aug 2015 09:00:44 +0100 (BST) Received: from AMDC1061.digital.local ([106.116.147.88]) by eusync2.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0NSP0013BCW67E10@eusync2.samsung.com>; Fri, 07 Aug 2015 09:00:44 +0100 (BST) From: Andrzej Hajda To: Mark Fasheh , Joel Becker Date: Fri, 07 Aug 2015 09:59:29 +0200 Message-id: <1438934377-4922-24-git-send-email-a.hajda@samsung.com> X-Mailer: git-send-email 1.9.1 In-reply-to: <1438934377-4922-1-git-send-email-a.hajda@samsung.com> References: <1438934377-4922-1-git-send-email-a.hajda@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprALMWRmVeSWpSXmKPExsVy+t/xK7prUo+EGrTNVrO4te4cq8XGGetZ LU6e+8ZicXnXHDaLtUfuslucOzORzWLXm3PsDuweTy8GeVxY9obNo2/LKkaP9Vuusnh83iQX wBrFZZOSmpNZllqkb5fAlbH61QWmgqU8FSfWhTQwzuLqYuTgkBAwkbi3ILeLkRPIFJO4cG89 WxcjF4eQwFJGiWMvm1hAEkICTUwSMz7qgthsApoSfzffZAOxRQRcJH40fWIBaWAWOMUocerI dUaQhLBApMTcIyeZQWwWAVWJRf297CDLeAWcJTZPF4VYJidx8thkVhCbEyi8snsmK8QuJ4k3 fReYJzDyLmBkWMUomlqaXFCclJ5rqFecmFtcmpeul5yfu4kREk5fdjAuPmZ1iFGAg1GJhzfh 3+FQIdbEsuLK3EOMEhzMSiK8D/WBQrwpiZVVqUX58UWlOanFhxilOViUxHnn7nofIiSQnliS mp2aWpBaBJNl4uCUamBc8SVp3wZmw5jGvQbWkW7xJQ/2+ywwYMz4J/rOS96h55Jd5v+iOfzp gsXiItPLIsSKuXf9ktncx//h+8amZTMUqhNWeE/WOlKgHD6jWDc/dO99uwXnN6yYdUeq9LQR R/rxZVYX+crcFjuXhR3tTHryJm7GrWNRR5P23GLJdnh0wcnvbmn+4hYlluKMREMt5qLiRADP 7sdvIwIAAA== X-ServerName: mailout3.w1.samsung.com X-Proofpoint-Virus-Version: vendor=nai engine=5700 definitions=7885 signatures=670620 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 suspectscore=2 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=7.0.1-1506180000 definitions=main-1508070140 X-Mailman-Approved-At: Mon, 17 Aug 2015 09:05:58 -0700 Cc: Andrzej Hajda , Marek Szyprowski , linux-kernel@vger.kernel.org, ocfs2-devel@oss.oracle.com, Bartlomiej Zolnierkiewicz Subject: [Ocfs2-devel] [PATCH 23/31] fs/ocfs2: use kmemdup rather than duplicating its implementation 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: userv0022.oracle.com [156.151.31.74] X-Spam-Status: No, score=-4.8 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, 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 The patch was generated using fixed coccinelle semantic patch scripts/coccinelle/api/memdup.cocci [1]. [1]: http://permalink.gmane.org/gmane.linux.kernel/2014320 Signed-off-by: Andrzej Hajda --- fs/ocfs2/localalloc.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/fs/ocfs2/localalloc.c b/fs/ocfs2/localalloc.c index 0a4457f..194d6d6 100644 --- a/fs/ocfs2/localalloc.c +++ b/fs/ocfs2/localalloc.c @@ -434,12 +434,11 @@ void ocfs2_shutdown_local_alloc(struct ocfs2_super *osb) bh = osb->local_alloc_bh; alloc = (struct ocfs2_dinode *) bh->b_data; - alloc_copy = kmalloc(bh->b_size, GFP_NOFS); + alloc_copy = kmemdup(alloc, bh->b_size, GFP_NOFS); if (!alloc_copy) { status = -ENOMEM; goto out_commit; } - memcpy(alloc_copy, alloc, bh->b_size); status = ocfs2_journal_access_di(handle, INODE_CACHE(local_alloc_inode), bh, OCFS2_JOURNAL_ACCESS_WRITE); @@ -1285,13 +1284,12 @@ static int ocfs2_local_alloc_slide_window(struct ocfs2_super *osb, * local alloc shutdown won't try to double free main bitmap * bits. Make a copy so the sync function knows which bits to * free. */ - alloc_copy = kmalloc(osb->local_alloc_bh->b_size, GFP_NOFS); + alloc_copy = kmemdup(alloc, osb->local_alloc_bh->b_size, GFP_NOFS); if (!alloc_copy) { status = -ENOMEM; mlog_errno(status); goto bail; } - memcpy(alloc_copy, alloc, osb->local_alloc_bh->b_size); status = ocfs2_journal_access_di(handle, INODE_CACHE(local_alloc_inode),