UBIFS: Use kmemdup rather than duplicating its implementation
PATCH 1/1 UBIFS: Use kmemdup rather than duplicating its implementation
From: Thomas Meyer <[email protected]>
Use kmemdup rather than duplicating its implementation
The semantic patch that makes this change is available in scripts/coccinelle/api/memdup.cocci.
---
fs/ubifs/tnc.c 2011-11-08 10:35:18.593599122 +0100 renamed from fs/ubifs/tnc.c 2011-11-07 19:38:24.250503228 +0100 +1 -2
@@ -344,12 +344,11 @@ static int lnc_add(struct ubifs_info *c, return err; } - lnc_node = kmalloc(zbr->len, GFP_NOFS); + lnc_node = kmemdup(node, zbr->len, GFP_NOFS); if (!lnc_node) /* We don't have to have the cache, so no error */ return 0; - memcpy(lnc_node, node, zbr->len); zbr->leaf = lnc_node; return 0; }
fs/ubifs/xattr.c 2011-11-08 10:35:21.073632366 +0100 renamed from fs/ubifs/xattr.c 2011-11-07 19:38:24.257169996 +0100 +2 -4
@@ -138,12 +138,11 @@ static int create_xattr(struct ubifs_inf ui = ubifs_inode(inode); ui->xattr = 1; ui->flags |= UBIFS_XATTR_FL; - ui->data = kmalloc(size, GFP_NOFS); + ui->data = kmemdup(value, size, GFP_NOFS); if (!ui->data) { err = -ENOMEM; goto out_free; } - memcpy(ui->data, value, size); inode->i_size = ui->ui_size = size; ui->data_len = size;
@@ -204,12 +203,11 @@ static int change_xattr(struct ubifs_inf return err; kfree(ui->data); - ui->data = kmalloc(size, GFP_NOFS); + ui->data = kmemdup(value, size, GFP_NOFS); if (!ui->data) { err = -ENOMEM; goto out_free; } - memcpy(ui->data, value, size); inode->i_size = ui->ui_size = size; ui->data_len = size;
fs/ubifs/lpt.c 2011-11-08 10:35:23.637000062 +0100 renamed from fs/ubifs/lpt.c 2011-11-07 19:38:24.223836156 +0100 +2 -4
@@ -1986,12 +1986,11 @@ again: if (path[h].in_tree) continue; - nnode = kmalloc(sz, GFP_NOFS); + nnode = kmemdup(&path[h].nnode, sz, GFP_NOFS); if (!nnode) { err = -ENOMEM; goto out; } - memcpy(nnode, &path[h].nnode, sz); parent = nnode->parent; parent->nbranch[nnode->iip].nnode = nnode; path[h].ptr.nnode = nnode;
@@ -2004,12 +2003,11 @@ again: const size_t sz = sizeof(struct ubifs_pnode); struct ubifs_nnode *parent; - pnode = kmalloc(sz, GFP_NOFS); + pnode = kmemdup(&path[h].pnode, sz, GFP_NOFS); if (!pnode) { err = -ENOMEM; goto out; } - memcpy(pnode, &path[h].pnode, sz); parent = pnode->parent; parent->nbranch[pnode->iip].pnode = pnode; path[h].ptr.pnode = pnode;
Quoted 8 lines · Thomas Meyer
From: Thomas Meyer <[email protected]>
Use kmemdup rather than duplicating its implementation
The semantic patch that makes this change is available in
scripts/coccinelle/api/memdup.cocci.Signed-off-by Thomas Meyer <[email protected]>
Thanks, but could you please send a patch which I can apply using git am? This one does not apply:
[dedekind@koala ubifs-2.6 (master)]$ patch --dry-run -p1 < ~/tmp/x.mbox patching file fs/ubifs/tnc.c
patching file fs/ubifs/xattr.c
patch: **** malformed patch at line 94: diff -u -p a/fs/ubifs/lpt.c b/fs/ubifs/lpt.c
Artem.