jffs2: use kmemdup

[Linux-MTD Mailing List]

Gitweb:     http://git.infradead.org/?p=mtd-2.6.git;a=commit;h=04aadf36de625647c72ec24c7e901896dd2a99e6
Commit:     04aadf36de625647c72ec24c7e901896dd2a99e6
Parent:     334e5f56f176e19f7a85c23152bd7901d2991380
Author:     Julia Lawall <julia at diku.dk>
AuthorDate: Sun Oct 17 21:56:15 2010 +0200
Committer:  David Woodhouse <David.Woodhouse at intel.com>
CommitDate: Mon Oct 25 01:33:15 2010 +0100

    jffs2: use kmemdup
    
    Convert a sequence of kmalloc and memcpy to use kmemdup.
    
    The semantic patch that performs this transformation is:
    (http://coccinelle.lip6.fr/)
    
    // <smpl>
    @@
    expression a,flag,len;
    expression arg,e1,e2;
    statement S;
    @@
    
      a =
    -  \(kmalloc\|kzalloc\)(len,flag)
    +  kmemdup(arg,len,flag)
      <... when != a
      if (a == NULL || ...) S
      ...>
    - memcpy(a,arg,len+1);
    // </smpl>
    
    Signed-off-by: Julia Lawall <julia at diku.dk>
    Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy at nokia.com>
    Signed-off-by: David Woodhouse <David.Woodhouse at intel.com>
---
 fs/jffs2/dir.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/fs/jffs2/dir.c b/fs/jffs2/dir.c
index ed78a3cf3..dd745c3 100644
--- a/fs/jffs2/dir.c
+++ b/fs/jffs2/dir.c
@@ -367,7 +367,7 @@ static int jffs2_symlink (struct inode *dir_i, struct dentry *dentry, const char
 	}
 
 	/* We use f->target field to store the target path. */
-	f->target = kmalloc(targetlen + 1, GFP_KERNEL);
+	f->target = kmemdup(target, targetlen + 1, GFP_KERNEL);
 	if (!f->target) {
 		printk(KERN_WARNING "Can't allocate %d bytes of memory\n", targetlen + 1);
 		mutex_unlock(&f->sem);
@@ -376,7 +376,6 @@ static int jffs2_symlink (struct inode *dir_i, struct dentry *dentry, const char
 		goto fail;
 	}
 
-	memcpy(f->target, target, targetlen + 1);
 	D1(printk(KERN_DEBUG "jffs2_symlink: symlink's target '%s' cached\n", (char *)f->target));
 
 	/* No data here. Only a metadata node, which will be