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>

3 files changed, 22 insertions, 32 deletions

diff --git a/net/bridge/br_fdb.c b/net/bridge/br_fdb.c
index 8117900af4de..b0812c91c0f0 100644
--- a/net/bridge/br_fdb.c
+++ b/net/bridge/br_fdb.c
@@ -181,9 +181,9 @@ void br_fdb_cleanup(unsigned long _data)
         spin_lock(&br->hash_lock);
         for (i = 0; i < BR_HASH_SIZE; i++) {
                 struct net_bridge_fdb_entry *f;
-                struct hlist_node *h, *n;
+                struct hlist_node *n;
 
-                hlist_for_each_entry_safe(f, h, n, &br->hash[i], hlist) {
+                hlist_for_each_entry_safe(f, n, &br->hash[i], hlist) {
                         unsigned long this_timer;
                         if (f->is_static)
                                 continue;
@@ -207,8 +207,8 @@ void br_fdb_flush(struct net_bridge *br)
         spin_lock_bh(&br->hash_lock);
         for (i = 0; i < BR_HASH_SIZE; i++) {
                 struct net_bridge_fdb_entry *f;
-                struct hlist_node *h, *n;
-                hlist_for_each_entry_safe(f, h, n, &br->hash[i], hlist) {
+                struct hlist_node *n;
+                hlist_for_each_entry_safe(f, n, &br->hash[i], hlist) {
                         if (!f->is_static)
                                 fdb_delete(br, f);
                 }
@@ -266,10 +266,9 @@ struct net_bridge_fdb_entry *__br_fdb_get(struct net_bridge *br,
                                           const unsigned char *addr,
                                           __u16 vid)
 {
-        struct hlist_node *h;
         struct net_bridge_fdb_entry *fdb;
 
-        hlist_for_each_entry_rcu(fdb, h,
+        hlist_for_each_entry_rcu(fdb,
                                 &br->hash[br_mac_hash(addr, vid)], hlist) {
                 if (ether_addr_equal(fdb->addr.addr, addr) &&
                     fdb->vlan_id == vid) {
@@ -315,14 +314,13 @@ int br_fdb_fillbuf(struct net_bridge *br, void *buf,
 {
         struct __fdb_entry *fe = buf;
         int i, num = 0;
-        struct hlist_node *h;
         struct net_bridge_fdb_entry *f;
 
         memset(buf, 0, maxnum*sizeof(struct __fdb_entry));
 
         rcu_read_lock();
         for (i = 0; i < BR_HASH_SIZE; i++) {
-                hlist_for_each_entry_rcu(f, h, &br->hash[i], hlist) {
+                hlist_for_each_entry_rcu(f, &br->hash[i], hlist) {
                         if (num >= maxnum)
                                 goto out;
 
@@ -363,10 +361,9 @@ static struct net_bridge_fdb_entry *fdb_find(struct hlist_head *head,
                                              const unsigned char *addr,
                                              __u16 vid)
 {
-        struct hlist_node *h;
         struct net_bridge_fdb_entry *fdb;
 
-        hlist_for_each_entry(fdb, h, head, hlist) {
+        hlist_for_each_entry(fdb, head, hlist) {
                 if (ether_addr_equal(fdb->addr.addr, addr) &&
                     fdb->vlan_id == vid)
                         return fdb;
@@ -378,10 +375,9 @@ static struct net_bridge_fdb_entry *fdb_find_rcu(struct hlist_head *head,
                                                  const unsigned char *addr,
                                                  __u16 vid)
 {
-        struct hlist_node *h;
         struct net_bridge_fdb_entry *fdb;
 
-        hlist_for_each_entry_rcu(fdb, h, head, hlist) {
+        hlist_for_each_entry_rcu(fdb, head, hlist) {
                 if (ether_addr_equal(fdb->addr.addr, addr) &&
                     fdb->vlan_id == vid)
                         return fdb;
@@ -593,10 +589,9 @@ int br_fdb_dump(struct sk_buff *skb,
                 goto out;
 
         for (i = 0; i < BR_HASH_SIZE; i++) {
-                struct hlist_node *h;
                 struct net_bridge_fdb_entry *f;
 
-                hlist_for_each_entry_rcu(f, h, &br->hash[i], hlist) {
+                hlist_for_each_entry_rcu(f, &br->hash[i], hlist) {
                         if (idx < cb->args[0])
                                 goto skip;
 
diff --git a/net/bridge/br_mdb.c b/net/bridge/br_mdb.c
index 38991e03646d..9f97b850fc65 100644
--- a/net/bridge/br_mdb.c
+++ b/net/bridge/br_mdb.c
@@ -18,7 +18,6 @@ static int br_rports_fill_info(struct sk_buff *skb, struct netlink_callback *cb,
 {
         struct net_bridge *br = netdev_priv(dev);
         struct net_bridge_port *p;
-        struct hlist_node *n;
         struct nlattr *nest;
 
         if (!br->multicast_router || hlist_empty(&br->router_list))
@@ -28,7 +27,7 @@ static int br_rports_fill_info(struct sk_buff *skb, struct netlink_callback *cb,
         if (nest == NULL)
                 return -EMSGSIZE;
 
-        hlist_for_each_entry_rcu(p, n, &br->router_list, rlist) {
+        hlist_for_each_entry_rcu(p, &br->router_list, rlist) {
                 if (p && nla_put_u32(skb, MDBA_ROUTER_PORT, p->dev->ifindex))
                         goto fail;
         }
@@ -61,12 +60,11 @@ static int br_mdb_fill_info(struct sk_buff *skb, struct netlink_callback *cb,
                 return -EMSGSIZE;
 
         for (i = 0; i < mdb->max; i++) {
-                struct hlist_node *h;
                 struct net_bridge_mdb_entry *mp;
                 struct net_bridge_port_group *p, **pp;
                 struct net_bridge_port *port;
 
-                hlist_for_each_entry_rcu(mp, h, &mdb->mhash[i], hlist[mdb->ver]) {
+                hlist_for_each_entry_rcu(mp, &mdb->mhash[i], hlist[mdb->ver]) {
                         if (idx < s_idx)
                                 goto skip;
 
diff --git a/net/bridge/br_multicast.c b/net/bridge/br_multicast.c
index 7d886b0a8b7b..10e6fce1bb62 100644
--- a/net/bridge/br_multicast.c
+++ b/net/bridge/br_multicast.c
@@ -86,9 +86,8 @@ static struct net_bridge_mdb_entry *__br_mdb_ip_get(
         struct net_bridge_mdb_htable *mdb, struct br_ip *dst, int hash)
 {
         struct net_bridge_mdb_entry *mp;
-        struct hlist_node *p;
 
-        hlist_for_each_entry_rcu(mp, p, &mdb->mhash[hash], hlist[mdb->ver]) {
+        hlist_for_each_entry_rcu(mp, &mdb->mhash[hash], hlist[mdb->ver]) {
                 if (br_ip_equal(&mp->addr, dst))
                         return mp;
         }
@@ -178,13 +177,12 @@ static int br_mdb_copy(struct net_bridge_mdb_htable *new,
                        int elasticity)
 {
         struct net_bridge_mdb_entry *mp;
-        struct hlist_node *p;
         int maxlen;
         int len;
         int i;
 
         for (i = 0; i < old->max; i++)
-                hlist_for_each_entry(mp, p, &old->mhash[i], hlist[old->ver])
+                hlist_for_each_entry(mp, &old->mhash[i], hlist[old->ver])
                         hlist_add_head(&mp->hlist[new->ver],
                                        &new->mhash[br_ip_hash(new, &mp->addr)]);
 
@@ -194,7 +192,7 @@ static int br_mdb_copy(struct net_bridge_mdb_htable *new,
         maxlen = 0;
         for (i = 0; i < new->max; i++) {
                 len = 0;
-                hlist_for_each_entry(mp, p, &new->mhash[i], hlist[new->ver])
+                hlist_for_each_entry(mp, &new->mhash[i], hlist[new->ver])
                         len++;
                 if (len > maxlen)
                         maxlen = len;
@@ -510,14 +508,13 @@ static struct net_bridge_mdb_entry *br_multicast_get_group(
 {
         struct net_bridge_mdb_htable *mdb;
         struct net_bridge_mdb_entry *mp;
-        struct hlist_node *p;
         unsigned int count = 0;
         unsigned int max;
         int elasticity;
         int err;
 
         mdb = rcu_dereference_protected(br->mdb, 1);
-        hlist_for_each_entry(mp, p, &mdb->mhash[hash], hlist[mdb->ver]) {
+        hlist_for_each_entry(mp, &mdb->mhash[hash], hlist[mdb->ver]) {
                 count++;
                 if (unlikely(br_ip_equal(group, &mp->addr)))
                         return mp;
@@ -882,10 +879,10 @@ void br_multicast_disable_port(struct net_bridge_port *port)
 {
         struct net_bridge *br = port->br;
         struct net_bridge_port_group *pg;
-        struct hlist_node *p, *n;
+        struct hlist_node *n;
 
         spin_lock(&br->multicast_lock);
-        hlist_for_each_entry_safe(pg, p, n, &port->mglist, mglist)
+        hlist_for_each_entry_safe(pg, n, &port->mglist, mglist)
                 br_multicast_del_pg(br, pg);
 
         if (!hlist_unhashed(&port->rlist))
@@ -1025,12 +1022,12 @@ static void br_multicast_add_router(struct net_bridge *br,
                                     struct net_bridge_port *port)
 {
         struct net_bridge_port *p;
-        struct hlist_node *n, *slot = NULL;
+        struct hlist_node *slot = NULL;
 
-        hlist_for_each_entry(p, n, &br->router_list, rlist) {
+        hlist_for_each_entry(p, &br->router_list, rlist) {
                 if ((unsigned long) port >= (unsigned long) p)
                         break;
-                slot = n;
+                slot = &p->rlist;
         }
 
         if (slot)
@@ -1653,7 +1650,7 @@ void br_multicast_stop(struct net_bridge *br)
 {
         struct net_bridge_mdb_htable *mdb;
         struct net_bridge_mdb_entry *mp;
-        struct hlist_node *p, *n;
+        struct hlist_node *n;
         u32 ver;
         int i;
 
@@ -1670,7 +1667,7 @@ void br_multicast_stop(struct net_bridge *br)
 
         ver = mdb->ver;
         for (i = 0; i < mdb->max; i++) {
-                hlist_for_each_entry_safe(mp, p, n, &mdb->mhash[i],
+                hlist_for_each_entry_safe(mp, n, &mdb->mhash[i],
                                           hlist[ver]) {
                         del_timer(&mp->timer);
                         call_rcu_bh(&mp->rcu, br_multicast_free_group);