dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

netlink: af_netlink cleanup (v2) 

Don't inline functions that cover several lines, and do inline
the trivial ones. Also make some arguments const.

Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
stephen hemminger 2011-12-22 08:52:02 +00:00 committed by David S. Miller
parent 65c64ce8ee
commit b57ef81ff8
2 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
net/netlink/af_netlink.c
View File

@ -98,7 +98,7 @@ static inline struct netlink_sock *nlk_sk(struct sock *sk)
return container_of(sk, struct netlink_sock, sk); return container_of(sk, struct netlink_sock, sk);
} }
static inline int netlink_is_kernel(struct sock *sk) static inline int netlink_is_kernel(const struct sock *sk)
{ {
return nlk_sk(sk)->flags & NETLINK_KERNEL_SOCKET; return nlk_sk(sk)->flags & NETLINK_KERNEL_SOCKET;
} }
@ -139,12 +139,12 @@ static atomic_t nl_table_users = ATOMIC_INIT(0);
static ATOMIC_NOTIFIER_HEAD(netlink_chain); static ATOMIC_NOTIFIER_HEAD(netlink_chain);
static u32 netlink_group_mask(u32 group) static inline u32 netlink_group_mask(u32 group)
{ {
return group ? 1 << (group - 1) : 0; return group ? 1 << (group - 1) : 0;
} }
static struct hlist_head *nl_pid_hashfn(struct nl_pid_hash *hash, u32 pid) static inline struct hlist_head *nl_pid_hashfn(struct nl_pid_hash *hash, u32 pid)
{ {
return &hash->table[jhash_1word(pid, hash->rnd) & hash->mask]; return &hash->table[jhash_1word(pid, hash->rnd) & hash->mask];
} }
@ -226,8 +226,7 @@ netlink_unlock_table(void)
wake_up(&nl_table_wait); wake_up(&nl_table_wait);
} }
static inline struct sock *netlink_lookup(struct net *net, int protocol, static struct sock *netlink_lookup(struct net *net, int protocol, u32 pid)
u32 pid)
{ {
struct nl_pid_hash *hash = &nl_table[protocol].hash; struct nl_pid_hash *hash = &nl_table[protocol].hash;
struct hlist_head *head; struct hlist_head *head;
@ -248,7 +247,7 @@ found:
return sk; return sk;
} }
static inline struct hlist_head *nl_pid_hash_zalloc(size_t size) static struct hlist_head *nl_pid_hash_zalloc(size_t size)
{ {
if (size <= PAGE_SIZE) if (size <= PAGE_SIZE)
return kzalloc(size, GFP_ATOMIC); return kzalloc(size, GFP_ATOMIC);
@ -258,7 +257,7 @@ static inline struct hlist_head *nl_pid_hash_zalloc(size_t size)
get_order(size)); get_order(size));
} }
static inline void nl_pid_hash_free(struct hlist_head *table, size_t size) static void nl_pid_hash_free(struct hlist_head *table, size_t size)
{ {
if (size <= PAGE_SIZE) if (size <= PAGE_SIZE)
kfree(table); kfree(table);
@ -578,7 +577,7 @@ retry:
return err; return err;
} }
static inline int netlink_capable(struct socket *sock, unsigned int flag) static inline int netlink_capable(const struct socket *sock, unsigned int flag)
{ {
return (nl_table[sock->sk->sk_protocol].nl_nonroot & flag) || return (nl_table[sock->sk->sk_protocol].nl_nonroot & flag) ||
capable(CAP_NET_ADMIN); capable(CAP_NET_ADMIN);
@ -846,8 +845,7 @@ void netlink_detachskb(struct sock *sk, struct sk_buff *skb)
sock_put(sk); sock_put(sk);
} }
static inline struct sk_buff *netlink_trim(struct sk_buff *skb, static struct sk_buff *netlink_trim(struct sk_buff *skb, gfp_t allocation)
gfp_t allocation)
{ {
int delta; int delta;
@ -871,7 +869,7 @@ static inline struct sk_buff *netlink_trim(struct sk_buff *skb,
return skb; return skb;
} }
static inline void netlink_rcv_wake(struct sock *sk) static void netlink_rcv_wake(struct sock *sk)
{ {
struct netlink_sock *nlk = nlk_sk(sk); struct netlink_sock *nlk = nlk_sk(sk);
@ -881,7 +879,7 @@ static inline void netlink_rcv_wake(struct sock *sk)
wake_up_interruptible(&nlk->wait); wake_up_interruptible(&nlk->wait);
} }
static inline int netlink_unicast_kernel(struct sock *sk, struct sk_buff *skb) static int netlink_unicast_kernel(struct sock *sk, struct sk_buff *skb)
{ {
int ret; int ret;
struct netlink_sock *nlk = nlk_sk(sk); struct netlink_sock *nlk = nlk_sk(sk);
@ -952,8 +950,7 @@ int netlink_has_listeners(struct sock *sk, unsigned int group)
} }
EXPORT_SYMBOL_GPL(netlink_has_listeners); EXPORT_SYMBOL_GPL(netlink_has_listeners);
static inline int netlink_broadcast_deliver(struct sock *sk, static int netlink_broadcast_deliver(struct sock *sk, struct sk_buff *skb)
struct sk_buff *skb)
{ {
struct netlink_sock *nlk = nlk_sk(sk); struct netlink_sock *nlk = nlk_sk(sk);
@ -982,7 +979,7 @@ struct netlink_broadcast_data {
void *tx_data; void *tx_data;
}; };
static inline int do_one_broadcast(struct sock *sk, static int do_one_broadcast(struct sock *sk,
struct netlink_broadcast_data *p) struct netlink_broadcast_data *p)
{ {
struct netlink_sock *nlk = nlk_sk(sk); struct netlink_sock *nlk = nlk_sk(sk);
@ -1110,8 +1107,7 @@ struct netlink_set_err_data {
int code; int code;
}; };
static inline int do_one_set_err(struct sock *sk, static int do_one_set_err(struct sock *sk, struct netlink_set_err_data *p)
struct netlink_set_err_data *p)
{ {
struct netlink_sock *nlk = nlk_sk(sk); struct netlink_sock *nlk = nlk_sk(sk);
int ret = 0; int ret = 0;

2
net/netlink/genetlink.c
View File

@ -106,7 +106,7 @@ static struct genl_ops *genl_get_cmd(u8 cmd, struct genl_family *family)
/* Of course we are going to have problems once we hit /* Of course we are going to have problems once we hit
* 2^16 alive types, but that can only happen by year 2K * 2^16 alive types, but that can only happen by year 2K
*/ */
static inline u16 genl_generate_id(void) static u16 genl_generate_id(void)
{ {
static u16 id_gen_idx = GENL_MIN_ID; static u16 id_gen_idx = GENL_MIN_ID;
int i; int i;