diff options
| author | Bart Van Assche <bart.vanassche@wdc.com> | 2018-06-15 15:20:42 -0700 |
|---|---|---|
| committer | Christoph Hellwig <hch@lst.de> | 2018-06-19 07:08:12 +0200 |
| commit | 707c62352909a9be2453ae073e160de59d2d4a1f (patch) | |
| tree | e408dc92a688006185ad24da21b889f603ec6559 /fs/configfs | |
| parent | ce397d215ccd07b8ae3f71db689aedb85d56ab40 (diff) | |
| download | linux-stable-707c62352909a9be2453ae073e160de59d2d4a1f.tar.gz linux-stable-707c62352909a9be2453ae073e160de59d2d4a1f.tar.bz2 linux-stable-707c62352909a9be2453ae073e160de59d2d4a1f.zip | |
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>
Diffstat (limited to 'fs/configfs')
| -rw-r--r-- | fs/configfs/item.c | 24 |
1 files changed, 4 insertions, 20 deletions
diff --git a/fs/configfs/item.c b/fs/configfs/item.c index 88f266efc09b..99d491cd01f9 100644 --- a/fs/configfs/item.c +++ b/fs/configfs/item.c @@ -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 error = 0; int limit = CONFIGFS_ITEM_NAME_LEN; int need; va_list args; @@ -79,25 +78,11 @@ int config_item_set_name(struct config_item *item, const char *fmt, ...) if (need < limit) name = item->ci_namebuf; 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); - need = vsnprintf(name, limit, fmt, args); + name = kvasprintf(GFP_KERNEL, fmt, args); va_end(args); - - /* Still? Give up. */ - if (need >= limit) { - kfree(name); - error = -EFAULT; - goto Done; - } + if (!name) + return -EFAULT; } /* 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 */ item->ci_name = name; - Done: - return error; + return 0; } EXPORT_SYMBOL(config_item_set_name); |