Commit 2a12ae5d authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller
Browse files

net: inline sock_prot_inuse_add() 



sock_prot_inuse_add() is very small, we can inline it.

Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent abc3342a

include/net/sock.h

+11 −3
Original line number Diff line number Diff line
@@ -1429,13 +1429,21 @@ proto_memory_pressure(struct proto *prot) 




#ifdef CONFIG_PROC_FS

#define PROTO_INUSE_NR	64	/* should be enough for the first time */

struct prot_inuse {

	int val[PROTO_INUSE_NR];

};

/* Called with local bh disabled */

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

static inline void sock_prot_inuse_add(const struct net *net,

				       const struct proto *prot, int val)

{

	__this_cpu_add(net->core.prot_inuse->val[prot->inuse_idx], val);

}

int sock_prot_inuse_get(struct net *net, struct proto *proto);

int sock_inuse_get(struct net *net);

#else

static inline void sock_prot_inuse_add(struct net *net, struct proto *prot,

		int inc)

static inline void sock_prot_inuse_add(const struct net *net,

				       const struct proto *prot, int val)

{

}

#endif

net/core/sock.c

+0 −11
Original line number Diff line number Diff line
@@ -3536,19 +3536,8 @@ void sk_get_meminfo(const struct sock *sk, u32 *mem) 
}



#ifdef CONFIG_PROC_FS

#define PROTO_INUSE_NR	64	/* should be enough for the first time */

struct prot_inuse {

	int val[PROTO_INUSE_NR];

};



static DECLARE_BITMAP(proto_inuse_idx, PROTO_INUSE_NR);



void sock_prot_inuse_add(struct net *net, struct proto *prot, int val)

{

	__this_cpu_add(net->core.prot_inuse->val[prot->inuse_idx], val);

}

EXPORT_SYMBOL_GPL(sock_prot_inuse_add);



int sock_prot_inuse_get(struct net *net, struct proto *prot)

{

	int cpu, idx = prot->inuse_idx;