Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit faf23422 authored by Alexey Dobriyan's avatar Alexey Dobriyan Committed by David S. Miller
Browse files

net: use kasprintf() for socket cache names 



kasprintf() makes code smaller.

Signed-off-by: default avatarAlexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8a5ce545

net/core/sock.c

+2 −8
Original line number Diff line number Diff line
@@ -2228,13 +2228,10 @@ int proto_register(struct proto *prot, int alloc_slab) 
		}



		if (prot->rsk_prot != NULL) {

			static const char mask[] = "request_sock_%s";



			prot->rsk_prot->slab_name = kmalloc(strlen(prot->name) + sizeof(mask) - 1, GFP_KERNEL);

			prot->rsk_prot->slab_name = kasprintf(GFP_KERNEL, "request_sock_%s", prot->name);

			if (prot->rsk_prot->slab_name == NULL)

				goto out_free_sock_slab;



			sprintf(prot->rsk_prot->slab_name, mask, prot->name);

			prot->rsk_prot->slab = kmem_cache_create(prot->rsk_prot->slab_name,

								 prot->rsk_prot->obj_size, 0,

								 SLAB_HWCACHE_ALIGN, NULL);
@@ -2247,14 +2244,11 @@ int proto_register(struct proto *prot, int alloc_slab) 
		}



		if (prot->twsk_prot != NULL) {

			static const char mask[] = "tw_sock_%s";



			prot->twsk_prot->twsk_slab_name = kmalloc(strlen(prot->name) + sizeof(mask) - 1, GFP_KERNEL);

			prot->twsk_prot->twsk_slab_name = kasprintf(GFP_KERNEL, "tw_sock_%s", prot->name);



			if (prot->twsk_prot->twsk_slab_name == NULL)

				goto out_free_request_sock_slab;



			sprintf(prot->twsk_prot->twsk_slab_name, mask, prot->name);

			prot->twsk_prot->twsk_slab =

				kmem_cache_create(prot->twsk_prot->twsk_slab_name,

						  prot->twsk_prot->twsk_obj_size,