diff options
author | Thomas Meyer <thomas@m3y3r.de> | 2011-11-17 18:00:52 -0500 |
---|---|---|
committer | Artem Bityutskiy <artem.bityutskiy@linux.intel.com> | 2011-11-22 03:58:48 -0500 |
commit | eaecf43a6970c8d0ef54a31427c82a99e4863fe8 (patch) | |
tree | 998f383df3a68c34e08efb5064dfc82536af5a48 /fs/ubifs/xattr.c | |
parent | cfcfc9eca2bcbd26a8e206baeb005b055dbf8e37 (diff) |
UBIFS: 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 <thomas@m3y3r.de>
Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
Diffstat (limited to 'fs/ubifs/xattr.c')
-rw-r--r-- | fs/ubifs/xattr.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/fs/ubifs/xattr.c b/fs/ubifs/xattr.c index bf18f7a0454..85b27226875 100644 --- a/fs/ubifs/xattr.c +++ b/fs/ubifs/xattr.c | |||
@@ -138,12 +138,11 @@ static int create_xattr(struct ubifs_info *c, struct inode *host, | |||
138 | ui = ubifs_inode(inode); | 138 | ui = ubifs_inode(inode); |
139 | ui->xattr = 1; | 139 | ui->xattr = 1; |
140 | ui->flags |= UBIFS_XATTR_FL; | 140 | ui->flags |= UBIFS_XATTR_FL; |
141 | ui->data = kmalloc(size, GFP_NOFS); | 141 | ui->data = kmemdup(value, size, GFP_NOFS); |
142 | if (!ui->data) { | 142 | if (!ui->data) { |
143 | err = -ENOMEM; | 143 | err = -ENOMEM; |
144 | goto out_free; | 144 | goto out_free; |
145 | } | 145 | } |
146 | memcpy(ui->data, value, size); | ||
147 | inode->i_size = ui->ui_size = size; | 146 | inode->i_size = ui->ui_size = size; |
148 | ui->data_len = size; | 147 | ui->data_len = size; |
149 | 148 | ||
@@ -204,12 +203,11 @@ static int change_xattr(struct ubifs_info *c, struct inode *host, | |||
204 | return err; | 203 | return err; |
205 | 204 | ||
206 | kfree(ui->data); | 205 | kfree(ui->data); |
207 | ui->data = kmalloc(size, GFP_NOFS); | 206 | ui->data = kmemdup(value, size, GFP_NOFS); |
208 | if (!ui->data) { | 207 | if (!ui->data) { |
209 | err = -ENOMEM; | 208 | err = -ENOMEM; |
210 | goto out_free; | 209 | goto out_free; |
211 | } | 210 | } |
212 | memcpy(ui->data, value, size); | ||
213 | inode->i_size = ui->ui_size = size; | 211 | inode->i_size = ui->ui_size = size; |
214 | ui->data_len = size; | 212 | ui->data_len = size; |
215 | 213 | ||