OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

configfs: use kvasprintf() instead of open-coding it 

Signed-off-by: Bart Van Assche <bart.vanassche@wdc.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
This commit is contained in:
Bart Van Assche 2018-06-15 15:20:42 -07:00 committed by Christoph Hellwig
parent ce397d215c
commit 707c623529
1 changed files with 4 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
fs/configfs/item.c
View File

@ -64,7 +64,6 @@ static void config_item_init(struct config_item *item)
*/ */
int config_item_set_name(struct config_item *item, const char *fmt, ...) int config_item_set_name(struct config_item *item, const char *fmt, ...)
{ {
int error = 0;
int limit = CONFIGFS_ITEM_NAME_LEN; int limit = CONFIGFS_ITEM_NAME_LEN;
int need; int need;
va_list args; va_list args;
@ -79,25 +78,11 @@ int config_item_set_name(struct config_item *item, const char *fmt, ...)
if (need < limit) if (need < limit)
name = item->ci_namebuf; name = item->ci_namebuf;
else { else {
/*
* Need more space? Allocate it and try again
*/
limit = need + 1;
name = kmalloc(limit, GFP_KERNEL);
if (!name) {
error = -ENOMEM;
goto Done;
}
va_start(args, fmt); va_start(args, fmt);
need = vsnprintf(name, limit, fmt, args); name = kvasprintf(GFP_KERNEL, fmt, args);
va_end(args); va_end(args);
if (!name)
/* Still? Give up. */ return -EFAULT;
if (need >= limit) {
kfree(name);
error = -EFAULT;
goto Done;
}
} }
/* Free the old name, if necessary. */ /* Free the old name, if necessary. */
@ -106,8 +91,7 @@ int config_item_set_name(struct config_item *item, const char *fmt, ...)
/* Now, set the new name */ /* Now, set the new name */
item->ci_name = name; item->ci_name = name;
Done: return 0;
return error;
} }
EXPORT_SYMBOL(config_item_set_name); EXPORT_SYMBOL(config_item_set_name);