From b42bc917f08c4adf03d6271599b959f99c4ad032 Mon Sep 17 00:00:00 2001 From: Ionut-Gabriel Radu Date: Sun, 10 Mar 2013 15:06:23 +0200 Subject: [PATCH] --- yaml --- r: 361305 b: refs/heads/master c: af591ad896ef75585752ac2eab4fba9437f23322 h: refs/heads/master i: 361303: 3ec404127383c5dee924d9c78201ea75b331077f v: v3 --- [refs] | 2 +- trunk/fs/reiserfs/super.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index b9600717ae1e..bce0e0736065 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8d0c2d10dd72c5292eda7a06231056a4c972e4cc +refs/heads/master: af591ad896ef75585752ac2eab4fba9437f23322 diff --git a/trunk/fs/reiserfs/super.c b/trunk/fs/reiserfs/super.c index 194113b1b11b..f8a23c3078f8 100644 --- a/trunk/fs/reiserfs/super.c +++ b/trunk/fs/reiserfs/super.c @@ -1147,8 +1147,7 @@ static int reiserfs_parse_options(struct super_block *s, char *options, /* strin "on filesystem root."); return 0; } - qf_names[qtype] = - kmalloc(strlen(arg) + 1, GFP_KERNEL); + qf_names[qtype] = kstrdup(arg, GFP_KERNEL); if (!qf_names[qtype]) { reiserfs_warning(s, "reiserfs-2502", "not enough memory " @@ -1156,7 +1155,6 @@ static int reiserfs_parse_options(struct super_block *s, char *options, /* strin "quotafile name."); return 0; } - strcpy(qf_names[qtype], arg); if (qtype == USRQUOTA) *mount_options |= 1 << REISERFS_USRQUOTA; else