Merge branch 'akpm' (final batch from Andrew)

Merge third patch-bumb from Andrew Morton:
 "This wraps me up for -rc1.
   - Lots of misc stuff and things which were deferred/missed from
     patchbombings 1 & 2.
   - ocfs2 things
   - lib/scatterlist
   - hfsplus
   - fatfs
   - documentation
   - signals
   - procfs
   - lockdep
   - coredump
   - seqfile core
   - kexec
   - Tejun's large IDR tree reworkings
   - ipmi
   - partitions
   - nbd
   - random() things
   - kfifo
   - tools/testing/selftests updates
   - Sasha's large and pointless hlist cleanup"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (163 commits)
  hlist: drop the node parameter from iterators
  kcmp: make it depend on CHECKPOINT_RESTORE
  selftests: add a simple doc
  tools/testing/selftests/Makefile: rearrange targets
  selftests/efivarfs: add create-read test
  selftests/efivarfs: add empty file creation test
  selftests: add tests for efivarfs
  kfifo: fix kfifo_alloc() and kfifo_init()
  kfifo: move kfifo.c from kernel/ to lib/
  arch Kconfig: centralise CONFIG_ARCH_NO_VIRT_TO_BUS
  w1: add support for DS2413 Dual Channel Addressable Switch
  memstick: move the dereference below the NULL test
  drivers/pps/clients/pps-gpio.c: use devm_kzalloc
  Documentation/DMA-API-HOWTO.txt: fix typo
  include/linux/eventfd.h: fix incorrect filename is a comment
  mtd: mtd_stresstest: use prandom_bytes()
  mtd: mtd_subpagetest: convert to use prandom library
  mtd: mtd_speedtest: use prandom_bytes
  mtd: mtd_pagetest: convert to use prandom library
  mtd: mtd_oobtest: convert to use prandom library
  ...

3 files changed, 6 insertions, 12 deletions

diff --git a/net/l2tp/l2tp_core.c b/net/l2tp/l2tp_core.c
index dcfd64e83ab7..d36875f3427e 100644
--- a/net/l2tp/l2tp_core.c
+++ b/net/l2tp/l2tp_core.c
@@ -221,10 +221,9 @@ static struct l2tp_session *l2tp_session_find_2(struct net *net, u32 session_id)
         struct hlist_head *session_list =
                 l2tp_session_id_hash_2(pn, session_id);
         struct l2tp_session *session;
-        struct hlist_node *walk;
 
         rcu_read_lock_bh();
-        hlist_for_each_entry_rcu(session, walk, session_list, global_hlist) {
+        hlist_for_each_entry_rcu(session, session_list, global_hlist) {
                 if (session->session_id == session_id) {
                         rcu_read_unlock_bh();
                         return session;
@@ -253,7 +252,6 @@ struct l2tp_session *l2tp_session_find(struct net *net, struct l2tp_tunnel *tunn
 {
         struct hlist_head *session_list;
         struct l2tp_session *session;
-        struct hlist_node *walk;
 
         /* In L2TPv3, session_ids are unique over all tunnels and we
          * sometimes need to look them up before we know the
@@ -264,7 +262,7 @@ struct l2tp_session *l2tp_session_find(struct net *net, struct l2tp_tunnel *tunn
 
         session_list = l2tp_session_id_hash(tunnel, session_id);
         read_lock_bh(&tunnel->hlist_lock);
-        hlist_for_each_entry(session, walk, session_list, hlist) {
+        hlist_for_each_entry(session, session_list, hlist) {
                 if (session->session_id == session_id) {
                         read_unlock_bh(&tunnel->hlist_lock);
                         return session;
@@ -279,13 +277,12 @@ EXPORT_SYMBOL_GPL(l2tp_session_find);
 struct l2tp_session *l2tp_session_find_nth(struct l2tp_tunnel *tunnel, int nth)
 {
         int hash;
-        struct hlist_node *walk;
         struct l2tp_session *session;
         int count = 0;
 
         read_lock_bh(&tunnel->hlist_lock);
         for (hash = 0; hash < L2TP_HASH_SIZE; hash++) {
-                hlist_for_each_entry(session, walk, &tunnel->session_hlist[hash], hlist) {
+                hlist_for_each_entry(session, &tunnel->session_hlist[hash], hlist) {
                         if (++count > nth) {
                                 read_unlock_bh(&tunnel->hlist_lock);
                                 return session;
@@ -306,12 +303,11 @@ struct l2tp_session *l2tp_session_find_by_ifname(struct net *net, char *ifname)
 {
         struct l2tp_net *pn = l2tp_pernet(net);
         int hash;
-        struct hlist_node *walk;
         struct l2tp_session *session;
 
         rcu_read_lock_bh();
         for (hash = 0; hash < L2TP_HASH_SIZE_2; hash++) {
-                hlist_for_each_entry_rcu(session, walk, &pn->l2tp_session_hlist[hash], global_hlist) {
+                hlist_for_each_entry_rcu(session, &pn->l2tp_session_hlist[hash], global_hlist) {
                         if (!strcmp(session->ifname, ifname)) {
                                 rcu_read_unlock_bh();
                                 return session;
diff --git a/net/l2tp/l2tp_ip.c b/net/l2tp/l2tp_ip.c
index f7ac8f42fee2..7f41b7051269 100644
--- a/net/l2tp/l2tp_ip.c
+++ b/net/l2tp/l2tp_ip.c
@@ -49,10 +49,9 @@ static inline struct l2tp_ip_sock *l2tp_ip_sk(const struct sock *sk)
 
 static struct sock *__l2tp_ip_bind_lookup(struct net *net, __be32 laddr, int dif, u32 tunnel_id)
 {
-        struct hlist_node *node;
         struct sock *sk;
 
-        sk_for_each_bound(sk, node, &l2tp_ip_bind_table) {
+        sk_for_each_bound(sk, &l2tp_ip_bind_table) {
                 struct inet_sock *inet = inet_sk(sk);
                 struct l2tp_ip_sock *l2tp = l2tp_ip_sk(sk);
 
diff --git a/net/l2tp/l2tp_ip6.c b/net/l2tp/l2tp_ip6.c
index 8ee4a86ae996..41f2f8126ebc 100644
--- a/net/l2tp/l2tp_ip6.c
+++ b/net/l2tp/l2tp_ip6.c
@@ -60,10 +60,9 @@ static struct sock *__l2tp_ip6_bind_lookup(struct net *net,
                                            struct in6_addr *laddr,
                                            int dif, u32 tunnel_id)
 {
-        struct hlist_node *node;
         struct sock *sk;
 
-        sk_for_each_bound(sk, node, &l2tp_ip6_bind_table) {
+        sk_for_each_bound(sk, &l2tp_ip6_bind_table) {
                 struct in6_addr *addr = inet6_rcv_saddr(sk);
                 struct l2tp_ip6_sock *l2tp = l2tp_ip6_sk(sk);