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

Commit 60e7663d authored by Pavel Emelyanov's avatar Pavel Emelyanov Committed by David S. Miller
Browse files

[SOCK]: Drop per-proto inuse init and fre functions (v2). 



Constructive part of the set is finished here. We have to remove the
pcounter, so start with its init and free functions.

Signed-off-by: default avatarPavel Emelyanov <xemul@openvz.org>
Acked-by: default avatarEric Dumazet <dada1@cosmosbay.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 1338d466

include/net/sock.h

+0 −18
Original line number Diff line number Diff line
@@ -640,31 +640,13 @@ static inline void sk_refcnt_debug_release(const struct sock *sk) 
# define REF_PROTO_INUSE(NAME) PCOUNTER_MEMBER_INITIALIZER(NAME, .inuse)

/* Called with local bh disabled */

extern void sock_prot_inuse_add(struct proto *prot, int inc);



static inline int sock_prot_inuse_init(struct proto *proto)

{

	return pcounter_alloc(&proto->inuse);

}



extern int sock_prot_inuse_get(struct proto *proto);



static inline void sock_prot_inuse_free(struct proto *proto)

{

	pcounter_free(&proto->inuse);

}

#else

# define DEFINE_PROTO_INUSE(NAME)

# define REF_PROTO_INUSE(NAME)

static void inline sock_prot_inuse_add(struct proto *prot, int inc)

{

}

static int inline sock_prot_inuse_init(struct proto *proto)

{

	return 0;

}

static void inline sock_prot_inuse_free(struct proto *proto)

{

}

#endif

net/core/sock.c

+1 −10
Original line number Diff line number Diff line
@@ -1999,11 +1999,6 @@ int proto_register(struct proto *prot, int alloc_slab) 
	char *request_sock_slab_name = NULL;

	char *timewait_sock_slab_name;



	if (sock_prot_inuse_init(prot) != 0) {

		printk(KERN_CRIT "%s: Can't alloc inuse counters!\n", prot->name);

		goto out;

	}



	if (alloc_slab) {

		prot->slab = kmem_cache_create(prot->name, prot->obj_size, 0,

					       SLAB_HWCACHE_ALIGN, NULL);
@@ -2011,7 +2006,7 @@ int proto_register(struct proto *prot, int alloc_slab) 
		if (prot->slab == NULL) {

			printk(KERN_CRIT "%s: Can't create sock SLAB cache!\n",

			       prot->name);

			goto out_free_inuse;

			goto out;

		}



		if (prot->rsk_prot != NULL) {
@@ -2070,8 +2065,6 @@ int proto_register(struct proto *prot, int alloc_slab) 
out_free_sock_slab:

	kmem_cache_destroy(prot->slab);

	prot->slab = NULL;

out_free_inuse:

	sock_prot_inuse_free(prot);

out:

	return -ENOBUFS;

}
@@ -2085,8 +2078,6 @@ void proto_unregister(struct proto *prot) 
	list_del(&prot->node);

	write_unlock(&proto_list_lock);



	sock_prot_inuse_free(prot);



	if (prot->slab != NULL) {

		kmem_cache_destroy(prot->slab);

		prot->slab = NULL;