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, 10 insertions, 11 deletions

diff --git a/drivers/net/ethernet/mellanox/mlx4/en_netdev.c b/drivers/net/ethernet/mellanox/mlx4/en_netdev.c
index 5385474bb526..bb4d8d99f36d 100644
--- a/drivers/net/ethernet/mellanox/mlx4/en_netdev.c
+++ b/drivers/net/ethernet/mellanox/mlx4/en_netdev.c
@@ -225,11 +225,10 @@ static inline struct mlx4_en_filter *
 mlx4_en_filter_find(struct mlx4_en_priv *priv, __be32 src_ip, __be32 dst_ip,
                     __be16 src_port, __be16 dst_port)
 {
-        struct hlist_node *elem;
         struct mlx4_en_filter *filter;
         struct mlx4_en_filter *ret = NULL;
 
-        hlist_for_each_entry(filter, elem,
+        hlist_for_each_entry(filter,
                              filter_hash_bucket(priv, src_ip, dst_ip,
                                                 src_port, dst_port),
                              filter_chain) {
@@ -574,13 +573,13 @@ static void mlx4_en_put_qp(struct mlx4_en_priv *priv)
 
         if (dev->caps.steering_mode != MLX4_STEERING_MODE_A0) {
                 struct mlx4_mac_entry *entry;
-                struct hlist_node *n, *tmp;
+                struct hlist_node *tmp;
                 struct hlist_head *bucket;
                 unsigned int mac_hash;
 
                 mac_hash = priv->dev->dev_addr[MLX4_EN_MAC_HASH_IDX];
                 bucket = &priv->mac_hash[mac_hash];
-                hlist_for_each_entry_safe(entry, n, tmp, bucket, hlist) {
+                hlist_for_each_entry_safe(entry, tmp, bucket, hlist) {
                         if (ether_addr_equal_64bits(entry->mac,
                                                     priv->dev->dev_addr)) {
                                 en_dbg(DRV, priv, "Releasing qp: port %d, MAC %pM, qpn %d\n",
@@ -609,11 +608,11 @@ static int mlx4_en_replace_mac(struct mlx4_en_priv *priv, int qpn,
                 struct hlist_head *bucket;
                 unsigned int mac_hash;
                 struct mlx4_mac_entry *entry;
-                struct hlist_node *n, *tmp;
+                struct hlist_node *tmp;
                 u64 prev_mac_u64 = mlx4_en_mac_to_u64(prev_mac);
 
                 bucket = &priv->mac_hash[prev_mac[MLX4_EN_MAC_HASH_IDX]];
-                hlist_for_each_entry_safe(entry, n, tmp, bucket, hlist) {
+                hlist_for_each_entry_safe(entry, tmp, bucket, hlist) {
                         if (ether_addr_equal_64bits(entry->mac, prev_mac)) {
                                 mlx4_en_uc_steer_release(priv, entry->mac,
                                                          qpn, entry->reg_id);
@@ -1019,7 +1018,7 @@ static void mlx4_en_do_uc_filter(struct mlx4_en_priv *priv,
 {
         struct netdev_hw_addr *ha;
         struct mlx4_mac_entry *entry;
-        struct hlist_node *n, *tmp;
+        struct hlist_node *tmp;
         bool found;
         u64 mac;
         int err = 0;
@@ -1035,7 +1034,7 @@ static void mlx4_en_do_uc_filter(struct mlx4_en_priv *priv,
         /* find what to remove */
         for (i = 0; i < MLX4_EN_MAC_HASH_SIZE; ++i) {
                 bucket = &priv->mac_hash[i];
-                hlist_for_each_entry_safe(entry, n, tmp, bucket, hlist) {
+                hlist_for_each_entry_safe(entry, tmp, bucket, hlist) {
                         found = false;
                         netdev_for_each_uc_addr(ha, dev) {
                                 if (ether_addr_equal_64bits(entry->mac,
@@ -1078,7 +1077,7 @@ static void mlx4_en_do_uc_filter(struct mlx4_en_priv *priv,
         netdev_for_each_uc_addr(ha, dev) {
                 found = false;
                 bucket = &priv->mac_hash[ha->addr[MLX4_EN_MAC_HASH_IDX]];
-                hlist_for_each_entry(entry, n, bucket, hlist) {
+                hlist_for_each_entry(entry, bucket, hlist) {
                         if (ether_addr_equal_64bits(entry->mac, ha->addr)) {
                                 found = true;
                                 break;
diff --git a/drivers/net/ethernet/mellanox/mlx4/en_rx.c b/drivers/net/ethernet/mellanox/mlx4/en_rx.c
index ce38654bbdd0..c7f856308e1a 100644
--- a/drivers/net/ethernet/mellanox/mlx4/en_rx.c
+++ b/drivers/net/ethernet/mellanox/mlx4/en_rx.c
@@ -35,6 +35,7 @@
 #include <linux/slab.h>
 #include <linux/mlx4/qp.h>
 #include <linux/skbuff.h>
+#include <linux/rculist.h>
 #include <linux/if_ether.h>
 #include <linux/if_vlan.h>
 #include <linux/vmalloc.h>
@@ -617,7 +618,6 @@ int mlx4_en_process_rx_cq(struct net_device *dev, struct mlx4_en_cq *cq, int bud
 
                         if (is_multicast_ether_addr(ethh->h_dest)) {
                                 struct mlx4_mac_entry *entry;
-                                struct hlist_node *n;
                                 struct hlist_head *bucket;
                                 unsigned int mac_hash;
 
@@ -625,7 +625,7 @@ int mlx4_en_process_rx_cq(struct net_device *dev, struct mlx4_en_cq *cq, int bud
                                 mac_hash = ethh->h_source[MLX4_EN_MAC_HASH_IDX];
                                 bucket = &priv->mac_hash[mac_hash];
                                 rcu_read_lock();
-                                hlist_for_each_entry_rcu(entry, n, bucket, hlist) {
+                                hlist_for_each_entry_rcu(entry, bucket, hlist) {
                                         if (ether_addr_equal_64bits(entry->mac,
                                                                     ethh->h_source)) {
                                                 rcu_read_unlock();