3 files changed, 8 insertions, 14 deletions

diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c
index 5b5c876c80e9..51be64f163ec 100644
--- 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 = {
@@ -2426,9 +2424,8 @@ static struct pernet_operations unix_net_ops = {
 static int __init af_unix_init(void)
 {
         int rc = -1;
-        struct sk_buff *dummy_skb;
 
-        BUILD_BUG_ON(sizeof(struct unix_skb_parms) > sizeof(dummy_skb->cb));
+        BUILD_BUG_ON(sizeof(struct unix_skb_parms) > FIELD_SIZEOF(struct sk_buff, cb));
 
         rc = proto_register(&unix_proto, 1);
         if (rc != 0) {
diff --git a/net/unix/diag.c b/net/unix/diag.c
index 5ac19dc1d5e4..d591091603bf 100644
--- a/net/unix/diag.c
+++ b/net/unix/diag.c
@@ -192,10 +192,9 @@ static int unix_diag_dump(struct sk_buff *skb, struct netlink_callback *cb)
              slot < ARRAY_SIZE(unix_socket_table);
              s_num = 0, slot++) {
                 struct sock *sk;
-                struct hlist_node *node;
 
                 num = 0;
-                sk_for_each(sk, node, &unix_socket_table[slot]) {
+                sk_for_each(sk, &unix_socket_table[slot]) {
                         if (!net_eq(sock_net(sk), net))
                                 continue;
                         if (num < s_num)
@@ -226,9 +225,7 @@ static struct sock *unix_lookup_by_ino(int ino)
 
         spin_lock(&unix_table_lock);
         for (i = 0; i < ARRAY_SIZE(unix_socket_table); i++) {
-                struct hlist_node *node;
-
-                sk_for_each(sk, node, &unix_socket_table[i])
+                sk_for_each(sk, &unix_socket_table[i])
                         if (ino == sock_i_ino(sk)) {
                                 sock_hold(sk);
                                 spin_unlock(&unix_table_lock);
diff --git a/net/unix/garbage.c b/net/unix/garbage.c
index b6f4b994eb35..d0f6545b0010 100644
--- a/net/unix/garbage.c
+++ b/net/unix/garbage.c
@@ -99,7 +99,7 @@ unsigned int unix_tot_inflight;
 struct sock *unix_get_socket(struct file *filp)
 {
         struct sock *u_sock = NULL;
-        struct inode *inode = filp->f_path.dentry->d_inode;
+        struct inode *inode = file_inode(filp);
 
         /*
          *      Socket ?