someOS/linux
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

UBIFS: use kmemdup rather than duplicating its implementation

Browse Source 
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 <a.hajda@samsung.com>
Reviewed-by: Richard Weinberger <richard@nod.at>
Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
This commit is contained in:
Andrzej Hajda
2015-08-07 09:59:31 +02:00
committed by Richard Weinberger
parent 9ffecb1028
commit bbc8a0044f
2 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
fs/ubifs/lpt.c
View File

@@ -1498,11 +1498,10 @@ static struct ubifs_nnode *dirty_cow_nnode(struct ubifs_info *c,
} }
/* nnode is being committed, so copy it */ /* 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)) if (unlikely(!n))
return ERR_PTR(-ENOMEM); return ERR_PTR(-ENOMEM);
memcpy(n, nnode, sizeof(struct ubifs_nnode));
n->cnext = NULL; n->cnext = NULL;
__set_bit(DIRTY_CNODE, &n->flags); __set_bit(DIRTY_CNODE, &n->flags);
__clear_bit(COW_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 */ /* 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)) if (unlikely(!p))
return ERR_PTR(-ENOMEM); return ERR_PTR(-ENOMEM);
memcpy(p, pnode, sizeof(struct ubifs_pnode));
p->cnext = NULL; p->cnext = NULL;
__set_bit(DIRTY_CNODE, &p->flags); __set_bit(DIRTY_CNODE, &p->flags);
__clear_bit(COW_CNODE, &p->flags); __clear_bit(COW_CNODE, &p->flags);

3
fs/ubifs/tnc.c
View File

@@ -198,11 +198,10 @@ static struct ubifs_znode *copy_znode(struct ubifs_info *c,
{ {
struct ubifs_znode *zn; struct ubifs_znode *zn;
zn = kmalloc(c->max_znode_sz, GFP_NOFS); zn = kmemdup(znode, c->max_znode_sz, GFP_NOFS);
if (unlikely(!zn)) if (unlikely(!zn))
return ERR_PTR(-ENOMEM); return ERR_PTR(-ENOMEM);
memcpy(zn, znode, c->max_znode_sz);
zn->cnext = NULL; zn->cnext = NULL;
__set_bit(DIRTY_ZNODE, &zn->flags); __set_bit(DIRTY_ZNODE, &zn->flags);
__clear_bit(COW_ZNODE, &zn->flags); __clear_bit(COW_ZNODE, &zn->flags);