val: nvpair allocation helper should take a struct str *

Signed-off-by: Josef 'Jeff' Sipek <[email protected]>

Author: jeffpc

nvl.c

@@ -126,7 +126,7 @@ int nvl_set(struct nvlist *nvl, const char *name, struct val *val)
 	pair = find(nvl, name);
 	if (!pair) {
 		/* not found - allocate a new pair */
-		pair = __nvpair_alloc(name);
+		pair = __nvpair_alloc(str_dup(name));
 		if (!pair) {
 			val_putref(val);
 			return -ENOMEM;

val_impl.h

@@ -29,7 +29,7 @@
 extern struct val *__val_alloc(enum val_type type);
 extern void __val_free_nvl(struct val *val);
 
-extern struct nvpair *__nvpair_alloc(const char *name);
+extern struct nvpair *__nvpair_alloc(struct str *name);
 extern void __nvpair_free(struct nvpair *pair);
 
 static inline bool val_is_null_cons(struct val *v)

val_nvl.c

@@ -33,17 +33,13 @@ static void __attribute__((constructor)) init_val_subsys(void)
 	ASSERT(!IS_ERR(nvpair_cache));
 }
 
-struct nvpair *__nvpair_alloc(const char *name)
+struct nvpair *__nvpair_alloc(struct str *name)
 {
 	struct nvpair *pair;
 
 	pair = mem_cache_alloc(nvpair_cache);
-	if (!pair)
-		return NULL;
-
-	pair->name = str_dup(name);
-	if (IS_ERR(pair->name)) {
-		mem_cache_free(nvpair_cache, pair);
+	if (!pair) {
+		str_putref(name);
 		return NULL;
 	}
 
@@ -55,6 +51,7 @@ struct nvpair *__nvpair_alloc(const char *name)
 	 * ->value is valid later on, even though we could have used
 	 *  val_alloc_null directly as it never fails.)
 	 */
+	pair->name = name;
 	pair->value = VAL_ALLOC_NULL();
 
 	return pair;