hlist: drop the node parameter from iterators

[mirror_ubuntu-artful-kernel.git] / net / unix / af_unix.c

diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c
index 0c612361c1534fa3edaaa0961873f2351371ee5e..51be64f163ec166812660db8de26105b1c92eb46 100644 (file)
--- a/net/unix/af_unix.c
+++ b/net/unix/af_unix.c
@@ -263,9 +263,8 @@ static struct sock *__unix_find_socket_byname(struct net *net,
                                              int len, int type, unsigned int hash)
 {
        struct sock *s;
-       struct hlist_node *node;
 
-       sk_for_each(s, node, &unix_socket_table[hash ^ type]) {
+       sk_for_each(s, &unix_socket_table[hash ^ type]) {
                struct unix_sock *u = unix_sk(s);
 
                if (!net_eq(sock_net(s), net))
@@ -298,10 +297,9 @@ static inline struct sock *unix_find_socket_byname(struct net *net,
 static struct sock *unix_find_socket_byinode(struct inode *i)
 {
        struct sock *s;
-       struct hlist_node *node;
 
        spin_lock(&unix_table_lock);
-       sk_for_each(s, node,
+       sk_for_each(s,
                    &unix_socket_table[i->i_ino & (UNIX_HASH_SIZE - 1)]) {
                struct dentry *dentry = unix_sk(s)->path.dentry;
 
@@ -2402,7 +2400,7 @@ static int __net_init unix_net_init(struct net *net)
                goto out;
 
 #ifdef CONFIG_PROC_FS
-       if (!proc_net_fops_create(net, "unix", 0, &unix_seq_fops)) {
+       if (!proc_create("unix", 0, net->proc_net, &unix_seq_fops)) {
                unix_sysctl_unregister(net);
                goto out;
        }
@@ -2415,7 +2413,7 @@ out:
 static void __net_exit unix_net_exit(struct net *net)
 {
        unix_sysctl_unregister(net);
-       proc_net_remove(net, "unix");
+       remove_proc_entry("unix", net->proc_net);
 }
 
 static struct pernet_operations unix_net_ops = {