Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 04aadf36 authored by Julia Lawall's avatar Julia Lawall Committed by David Woodhouse
Browse files

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: default avatarJulia Lawall <julia@diku.dk>
Signed-off-by: default avatarArtem Bityutskiy <Artem.Bityutskiy@nokia.com>
Signed-off-by: default avatarDavid Woodhouse <David.Woodhouse@intel.com>
parent 334e5f56

fs/jffs2/dir.c

+1 −2
Original line number Diff line number Diff line
@@ -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