From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1422730AbbHGIAx (ORCPT ); Fri, 7 Aug 2015 04:00:53 -0400 Received: from mailout4.w1.samsung.com ([210.118.77.14]:25491 "EHLO mailout4.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1422681AbbHGIAs (ORCPT ); Fri, 7 Aug 2015 04:00:48 -0400 X-AuditID: cbfec7f5-f794b6d000001495-39-55c465aef4fa From: Andrzej Hajda To: Artem Bityutskiy , Adrian Hunter Cc: Andrzej Hajda , Bartlomiej Zolnierkiewicz , Marek Szyprowski , linux-kernel@vger.kernel.org, linux-mtd@lists.infradead.org Subject: [PATCH 25/31] fs/ubifs: use kmemdup rather than duplicating its implementation Date: Fri, 07 Aug 2015 09:59:31 +0200 Message-id: <1438934377-4922-26-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+NgFprILMWRmVeSWpSXmKPExsVy+t/xK7rrUo+EGjyYomxxa905VouTT9aw WWycsZ7V4lb3a0aLy7vmsFnsblrGbrH2yF12B3aPnbPusnss3vOSyWPzknqPvi2rGD0+b5IL YI3isklJzcksSy3St0vgypixah5zwSe+ivNfXrA1MG7i6WLk4JAQMJFYv8msi5ETyBSTuHBv PVsXIxeHkMBSRolvW/pYQRJCAk1MEpd+OIPYbAKaEn8332QDsUUEQiWeLZzGDmIzC5xllHjZ pgZiCwtESsz52c0IYrMIqEpcuj4TrJ5XwFnizdHdzBDL5CROHpsMNp8TKL6yeybULieJN30X mCcw8i5gZFjFKJpamlxQnJSea6RXnJhbXJqXrpecn7uJERJQX3cwLj1mdYhRgINRiYc34d/h UCHWxLLiytxDjBIczEoivA/1gUK8KYmVValF+fFFpTmpxYcYpTlYlMR5Z+56HyIkkJ5Ykpqd mlqQWgSTZeLglGpgdL+VevBLW2rBQ/uFpSEX96/wrTdjrWTvOZa/Yv6GCZ4ftGrX7T6rtuiP sUlhROnynQlPHsjovpnaYSn/6k4Um+/0Xxf7vH59ufpl8gxx3dMztTpDexdln55TJbP2k/1M te9TK/OfJT32X3c+QPMMO59mqYLps/te5QvSuOfEcs6TWCQ6P/jbIiWW4oxEQy3mouJEAAmI I64kAgAA Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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/ubifs/lpt.c | 6 ++---- fs/ubifs/tnc.c | 3 +-- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/fs/ubifs/lpt.c b/fs/ubifs/lpt.c index dc9f27e..9a51710 100644 --- a/fs/ubifs/lpt.c +++ b/fs/ubifs/lpt.c @@ -1498,11 +1498,10 @@ static struct ubifs_nnode *dirty_cow_nnode(struct ubifs_info *c, } /* nnode is being committed, so copy it */ - n = kmalloc(sizeof(struct ubifs_nnode), GFP_NOFS); + n = kmemdup(nnode, sizeof(struct ubifs_nnode), GFP_NOFS); if (unlikely(!n)) return ERR_PTR(-ENOMEM); - memcpy(n, nnode, sizeof(struct ubifs_nnode)); n->cnext = NULL; __set_bit(DIRTY_CNODE, &n->flags); __clear_bit(COW_CNODE, &n->flags); @@ -1549,11 +1548,10 @@ static struct ubifs_pnode *dirty_cow_pnode(struct ubifs_info *c, } /* pnode is being committed, so copy it */ - p = kmalloc(sizeof(struct ubifs_pnode), GFP_NOFS); + p = kmemdup(pnode, sizeof(struct ubifs_pnode), GFP_NOFS); if (unlikely(!p)) return ERR_PTR(-ENOMEM); - memcpy(p, pnode, sizeof(struct ubifs_pnode)); p->cnext = NULL; __set_bit(DIRTY_CNODE, &p->flags); __clear_bit(COW_CNODE, &p->flags); diff --git a/fs/ubifs/tnc.c b/fs/ubifs/tnc.c index 957f575..fa9a20c 100644 --- a/fs/ubifs/tnc.c +++ b/fs/ubifs/tnc.c @@ -198,11 +198,10 @@ static struct ubifs_znode *copy_znode(struct ubifs_info *c, { struct ubifs_znode *zn; - zn = kmalloc(c->max_znode_sz, GFP_NOFS); + zn = kmemdup(znode, c->max_znode_sz, GFP_NOFS); if (unlikely(!zn)) return ERR_PTR(-ENOMEM); - memcpy(zn, znode, c->max_znode_sz); zn->cnext = NULL; __set_bit(DIRTY_ZNODE, &zn->flags); __clear_bit(COW_ZNODE, &zn->flags); -- 1.9.1