hlist: drop the node parameter from iterators

I'm not sure why, but the hlist for each entry iterators were conceived

        list_for_each_entry(pos, head, member)

The hlist ones were greedy and wanted an extra parameter:

        hlist_for_each_entry(tpos, pos, head, member)

Why did they need an extra pos parameter? I'm not quite sure. Not only
they don't really need it, it also prevents the iterator from looking
exactly like the list iterator, which is unfortunate.

Besides the semantic patch, there was some manual work required:

 - Fix up the actual hlist iterators in linux/list.h
 - Fix up the declaration of other iterators based on the hlist ones.
 - A very small amount of places were using the 'node' parameter, this
 was modified to use 'obj->member' instead.
 - Coccinelle didn't handle the hlist_for_each_entry_safe iterator
 properly, so those had to be fixed up manually.

The semantic patch which is mostly the work of Peter Senna Tschudin is here:

@@
iterator name hlist_for_each_entry, hlist_for_each_entry_continue, hlist_for_each_entry_from, hlist_for_each_entry_rcu, hlist_for_each_entry_rcu_bh, hlist_for_each_entry_continue_rcu_bh, for_each_busy_worker, ax25_uid_for_each, ax25_for_each, inet_bind_bucket_for_each, sctp_for_each_hentry, sk_for_each, sk_for_each_rcu, sk_for_each_from, sk_for_each_safe, sk_for_each_bound, hlist_for_each_entry_safe, hlist_for_each_entry_continue_rcu, nr_neigh_for_each, nr_neigh_for_each_safe, nr_node_for_each, nr_node_for_each_safe, for_each_gfn_indirect_valid_sp, for_each_gfn_sp, for_each_host;

type T;
expression a,c,d,e;
identifier b;
statement S;
@@

-T b;
    <+... when != b
(
hlist_for_each_entry(a,
- b,
c, d) S
|
hlist_for_each_entry_continue(a,
- b,
c) S
|
hlist_for_each_entry_from(a,
- b,
c) S
|
hlist_for_each_entry_rcu(a,
- b,
c, d) S
|
hlist_for_each_entry_rcu_bh(a,
- b,
c, d) S
|
hlist_for_each_entry_continue_rcu_bh(a,
- b,
c) S
|
for_each_busy_worker(a, c,
- b,
d) S
|
ax25_uid_for_each(a,
- b,
c) S
|
ax25_for_each(a,
- b,
c) S
|
inet_bind_bucket_for_each(a,
- b,
c) S
|
sctp_for_each_hentry(a,
- b,
c) S
|
sk_for_each(a,
- b,
c) S
|
sk_for_each_rcu(a,
- b,
c) S
|
sk_for_each_from
-(a, b)
+(a)
S
+ sk_for_each_from(a) S
|
sk_for_each_safe(a,
- b,
c, d) S
|
sk_for_each_bound(a,
- b,
c) S
|
hlist_for_each_entry_safe(a,
- b,
c, d, e) S
|
hlist_for_each_entry_continue_rcu(a,
- b,
c) S
|
nr_neigh_for_each(a,
- b,
c) S
|
nr_neigh_for_each_safe(a,
- b,
c, d) S
|
nr_node_for_each(a,
- b,
c) S
|
nr_node_for_each_safe(a,
- b,
c, d) S
|
- for_each_gfn_sp(a, c, d, b) S
+ for_each_gfn_sp(a, c, d) S
|
- for_each_gfn_indirect_valid_sp(a, c, d, b) S
+ for_each_gfn_indirect_valid_sp(a, c, d) S
|
for_each_host(a,
- b,
c) S
|
for_each_host_safe(a,
- b,
c, d) S
|
for_each_mesh_entry(a,
- b,
c, d) S
)
    ...+>

[akpm@linux-foundation.org: drop bogus change from net/ipv4/raw.c]
[akpm@linux-foundation.org: drop bogus hunk from net/ipv6/raw.c]
[akpm@linux-foundation.org: checkpatch fixes]
[akpm@linux-foundation.org: fix warnings]
[akpm@linux-foudnation.org: redo intrusive kvm changes]
Tested-by: Peter Senna Tschudin <peter.senna@gmail.com>
Acked-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
Cc: Wu Fengguang <fengguang.wu@intel.com>
Cc: Marcelo Tosatti <mtosatti@redhat.com>
Cc: Gleb Natapov <gleb@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

2 files changed, 8 insertions, 13 deletions

diff --git a/net/ipx/af_ipx.c b/net/ipx/af_ipx.c
index dfd6faaf0ea7..f547a47d381c 100644
--- a/net/ipx/af_ipx.c
+++ b/net/ipx/af_ipx.c
@@ -228,9 +228,8 @@ static struct sock *__ipxitf_find_socket(struct ipx_interface *intrfc,
                                          __be16 port)
 {
         struct sock *s;
-        struct hlist_node *node;
 
-        sk_for_each(s, node, &intrfc->if_sklist)
+        sk_for_each(s, &intrfc->if_sklist)
                 if (ipx_sk(s)->port == port)
                         goto found;
         s = NULL;
@@ -259,12 +258,11 @@ static struct sock *ipxitf_find_internal_socket(struct ipx_interface *intrfc,
                                                 __be16 port)
 {
         struct sock *s;
-        struct hlist_node *node;
 
         ipxitf_hold(intrfc);
         spin_lock_bh(&intrfc->if_sklist_lock);
 
-        sk_for_each(s, node, &intrfc->if_sklist) {
+        sk_for_each(s, &intrfc->if_sklist) {
                 struct ipx_sock *ipxs = ipx_sk(s);
 
                 if (ipxs->port == port &&
@@ -282,14 +280,14 @@ found:
 static void __ipxitf_down(struct ipx_interface *intrfc)
 {
         struct sock *s;
-        struct hlist_node *node, *t;
+        struct hlist_node *t;
 
         /* Delete all routes associated with this interface */
         ipxrtr_del_routes(intrfc);
 
         spin_lock_bh(&intrfc->if_sklist_lock);
         /* error sockets */
-        sk_for_each_safe(s, node, t, &intrfc->if_sklist) {
+        sk_for_each_safe(s, t, &intrfc->if_sklist) {
                 struct ipx_sock *ipxs = ipx_sk(s);
 
                 s->sk_err = ENOLINK;
@@ -385,12 +383,11 @@ static int ipxitf_demux_socket(struct ipx_interface *intrfc,
         int is_broadcast = !memcmp(ipx->ipx_dest.node, ipx_broadcast_node,
                                    IPX_NODE_LEN);
         struct sock *s;
-        struct hlist_node *node;
         int rc;
 
         spin_lock_bh(&intrfc->if_sklist_lock);
 
-        sk_for_each(s, node, &intrfc->if_sklist) {
+        sk_for_each(s, &intrfc->if_sklist) {
                 struct ipx_sock *ipxs = ipx_sk(s);
 
                 if (ipxs->port == ipx->ipx_dest.sock &&
@@ -446,12 +443,11 @@ static struct sock *ncp_connection_hack(struct ipx_interface *intrfc,
                 connection = (((int) *(ncphdr + 9)) << 8) | (int) *(ncphdr + 8);
 
         if (connection) {
-                struct hlist_node *node;
                 /* Now we have to look for a special NCP connection handling
                  * socket. Only these sockets have ipx_ncp_conn != 0, set by
                  * SIOCIPXNCPCONN. */
                 spin_lock_bh(&intrfc->if_sklist_lock);
-                sk_for_each(sk, node, &intrfc->if_sklist)
+                sk_for_each(sk, &intrfc->if_sklist)
                         if (ipx_sk(sk)->ipx_ncp_conn == connection) {
                                 sock_hold(sk);
                                 goto found;
diff --git a/net/ipx/ipx_proc.c b/net/ipx/ipx_proc.c
index 02ff7f2f60d4..65e8833a2510 100644
--- a/net/ipx/ipx_proc.c
+++ b/net/ipx/ipx_proc.c
@@ -103,19 +103,18 @@ out:
 static __inline__ struct sock *ipx_get_socket_idx(loff_t pos)
 {
         struct sock *s = NULL;
-        struct hlist_node *node;
         struct ipx_interface *i;
 
         list_for_each_entry(i, &ipx_interfaces, node) {
                 spin_lock_bh(&i->if_sklist_lock);
-                sk_for_each(s, node, &i->if_sklist) {
+                sk_for_each(s, &i->if_sklist) {
                         if (!pos)
                                 break;
                         --pos;
                 }
                 spin_unlock_bh(&i->if_sklist_lock);
                 if (!pos) {
-                        if (node)
+                        if (s)
                                 goto found;
                         break;
                 }