aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJulia Lawall <julia@diku.dk>2010-10-17 15:55:21 -0400
committerSage Weil <sage@newdream.net>2010-10-20 18:38:26 -0400
commit61413c2f594e6b63db2b14c70c2e7d8cf02f9c00 (patch)
tree2201b24eafc589067890a681a5e4e3431f8decdc
parent85b5aaa624aac568b8a3a88dbe4de6628c7cc527 (diff)
fs/ceph/xattr.c: 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@diku.dk> Signed-off-by: Sage Weil <sage@newdream.net>
-rw-r--r--fs/ceph/xattr.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/ceph/xattr.c b/fs/ceph/xattr.c
index 70e919960acb..6e12a6ba5f79 100644
--- a/fs/ceph/xattr.c
+++ b/fs/ceph/xattr.c
@@ -716,10 +716,9 @@ int ceph_setxattr(struct dentry *dentry, const char *name,
716 716
717 /* preallocate memory for xattr name, value, index node */ 717 /* preallocate memory for xattr name, value, index node */
718 err = -ENOMEM; 718 err = -ENOMEM;
719 newname = kmalloc(name_len + 1, GFP_NOFS); 719 newname = kmemdup(name, name_len + 1, GFP_NOFS);
720 if (!newname) 720 if (!newname)
721 goto out; 721 goto out;
722 memcpy(newname, name, name_len + 1);
723 722
724 if (val_len) { 723 if (val_len) {
725 newval = kmalloc(val_len + 1, GFP_NOFS); 724 newval = kmalloc(val_len + 1, GFP_NOFS);