hlist: drop the node parameter from iterators

[~andy/linux] / net / netlink / af_netlink.c

diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c
index 8097b4f3ead4decdcbacb87cbe3a8c8ba0436f2c..1e3fd5bfcd86a995fcbfd4277452738a7a823727 100644 (file)
--- a/net/netlink/af_netlink.c
+++ b/net/netlink/af_netlink.c
@@ -248,11 +248,10 @@ static struct sock *netlink_lookup(struct net *net, int protocol, u32 portid)
        struct nl_portid_hash *hash = &nl_table[protocol].hash;
        struct hlist_head *head;
        struct sock *sk;
-       struct hlist_node *node;
 
        read_lock(&nl_table_lock);
        head = nl_portid_hashfn(hash, portid);
-       sk_for_each(sk, node, head) {
+       sk_for_each(sk, head) {
                if (net_eq(sock_net(sk), net) && (nlk_sk(sk)->portid == portid)) {
                        sock_hold(sk);
                        goto found;
@@ -312,9 +311,9 @@ static int nl_portid_hash_rehash(struct nl_portid_hash *hash, int grow)
 
        for (i = 0; i <= omask; i++) {
                struct sock *sk;
-               struct hlist_node *node, *tmp;
+               struct hlist_node *tmp;
 
-               sk_for_each_safe(sk, node, tmp, &otable[i])
+               sk_for_each_safe(sk, tmp, &otable[i])
                        __sk_add_node(sk, nl_portid_hashfn(hash, nlk_sk(sk)->portid));
        }
 
@@ -344,7 +343,6 @@ static void
 netlink_update_listeners(struct sock *sk)
 {
        struct netlink_table *tbl = &nl_table[sk->sk_protocol];
-       struct hlist_node *node;
        unsigned long mask;
        unsigned int i;
        struct listeners *listeners;
@@ -355,7 +353,7 @@ netlink_update_listeners(struct sock *sk)
 
        for (i = 0; i < NLGRPLONGS(tbl->groups); i++) {
                mask = 0;
-               sk_for_each_bound(sk, node, &tbl->mc_list) {
+               sk_for_each_bound(sk, &tbl->mc_list) {
                        if (i < NLGRPLONGS(nlk_sk(sk)->ngroups))
                                mask |= nlk_sk(sk)->groups[i];
                }
@@ -371,18 +369,17 @@ static int netlink_insert(struct sock *sk, struct net *net, u32 portid)
        struct hlist_head *head;
        int err = -EADDRINUSE;
        struct sock *osk;
-       struct hlist_node *node;
        int len;
 
        netlink_table_grab();
        head = nl_portid_hashfn(hash, portid);
        len = 0;
-       sk_for_each(osk, node, head) {
+       sk_for_each(osk, head) {
                if (net_eq(sock_net(osk), net) && (nlk_sk(osk)->portid == portid))
                        break;
                len++;
        }
-       if (node)
+       if (osk)
                goto err;
 
        err = -EBUSY;
@@ -575,7 +572,6 @@ static int netlink_autobind(struct socket *sock)
        struct nl_portid_hash *hash = &nl_table[sk->sk_protocol].hash;
        struct hlist_head *head;
        struct sock *osk;
-       struct hlist_node *node;
        s32 portid = task_tgid_vnr(current);
        int err;
        static s32 rover = -4097;
@@ -584,7 +580,7 @@ retry:
        cond_resched();
        netlink_table_grab();
        head = nl_portid_hashfn(hash, portid);
-       sk_for_each(osk, node, head) {
+       sk_for_each(osk, head) {
                if (!net_eq(sock_net(osk), net))
                        continue;
                if (nlk_sk(osk)->portid == portid) {
@@ -1101,7 +1097,6 @@ int netlink_broadcast_filtered(struct sock *ssk, struct sk_buff *skb, u32 portid
 {
        struct net *net = sock_net(ssk);
        struct netlink_broadcast_data info;
-       struct hlist_node *node;
        struct sock *sk;
 
        skb = netlink_trim(skb, allocation);
@@ -1124,7 +1119,7 @@ int netlink_broadcast_filtered(struct sock *ssk, struct sk_buff *skb, u32 portid
 
        netlink_lock_table();
 
-       sk_for_each_bound(sk, node, &nl_table[ssk->sk_protocol].mc_list)
+       sk_for_each_bound(sk, &nl_table[ssk->sk_protocol].mc_list)
                do_one_broadcast(sk, &info);
 
        consume_skb(skb);
@@ -1200,7 +1195,6 @@ out:
 int netlink_set_err(struct sock *ssk, u32 portid, u32 group, int code)
 {
        struct netlink_set_err_data info;
-       struct hlist_node *node;
        struct sock *sk;
        int ret = 0;
 
@@ -1212,7 +1206,7 @@ int netlink_set_err(struct sock *ssk, u32 portid, u32 group, int code)
 
        read_lock(&nl_table_lock);
 
-       sk_for_each_bound(sk, node, &nl_table[ssk->sk_protocol].mc_list)
+       sk_for_each_bound(sk, &nl_table[ssk->sk_protocol].mc_list)
                ret += do_one_set_err(sk, &info);
 
        read_unlock(&nl_table_lock);
@@ -1676,10 +1670,9 @@ int netlink_change_ngroups(struct sock *sk, unsigned int groups)
 void __netlink_clear_multicast_users(struct sock *ksk, unsigned int group)
 {
        struct sock *sk;
-       struct hlist_node *node;
        struct netlink_table *tbl = &nl_table[ksk->sk_protocol];
 
-       sk_for_each_bound(sk, node, &tbl->mc_list)
+       sk_for_each_bound(sk, &tbl->mc_list)
                netlink_update_socket_mc(nlk_sk(sk), group, 0);
 }
 
@@ -1974,14 +1967,13 @@ static struct sock *netlink_seq_socket_idx(struct seq_file *seq, loff_t pos)
        struct nl_seq_iter *iter = seq->private;
        int i, j;
        struct sock *s;
-       struct hlist_node *node;
        loff_t off = 0;
 
        for (i = 0; i < MAX_LINKS; i++) {
                struct nl_portid_hash *hash = &nl_table[i].hash;
 
                for (j = 0; j <= hash->mask; j++) {
-                       sk_for_each(s, node, &hash->table[j]) {
+                       sk_for_each(s, &hash->table[j]) {
                                if (sock_net(s) != seq_file_net(seq))
                                        continue;
                                if (off == pos) {