3 files changed, 16 insertions, 16 deletions

diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c
index fc820cd75453..3d9122e78f41 100644
--- a/net/unix/af_unix.c
+++ b/net/unix/af_unix.c
@@ -144,7 +144,7 @@ static inline void unix_set_secdata(struct scm_cookie *scm, struct sk_buff *skb)
 /*
  *  SMP locking strategy:
  *    hash table is protected with spinlock unix_table_lock
- *    each socket state is protected by separate rwlock.
+ *    each socket state is protected by separate spin lock.
  */
 
 static inline unsigned unix_hash_fold(__wsum n)
@@ -621,7 +621,8 @@ out:
         return sk;
 }
 
-static int unix_create(struct net *net, struct socket *sock, int protocol)
+static int unix_create(struct net *net, struct socket *sock, int protocol,
+                       int kern)
 {
         if (protocol && protocol != PF_UNIX)
                 return -EPROTONOSUPPORT;
@@ -1032,8 +1033,8 @@ static int unix_stream_connect(struct socket *sock, struct sockaddr *uaddr,
                 goto out;
         addr_len = err;
 
-        if (test_bit(SOCK_PASSCRED, &sock->flags)
-                && !u->addr && (err = unix_autobind(sock)) != 0)
+        if (test_bit(SOCK_PASSCRED, &sock->flags) && !u->addr &&
+            (err = unix_autobind(sock)) != 0)
                 goto out;
 
         timeo = sock_sndtimeo(sk, flags & O_NONBLOCK);
@@ -1258,7 +1259,7 @@ static int unix_getname(struct socket *sock, struct sockaddr *uaddr, int *uaddr_
 {
         struct sock *sk = sock->sk;
         struct unix_sock *u;
-        struct sockaddr_un *sunaddr = (struct sockaddr_un *)uaddr;
+        DECLARE_SOCKADDR(struct sockaddr_un *, sunaddr, uaddr);
         int err = 0;
 
         if (peer) {
@@ -1377,8 +1378,8 @@ static int unix_dgram_sendmsg(struct kiocb *kiocb, struct socket *sock,
                         goto out;
         }
 
-        if (test_bit(SOCK_PASSCRED, &sock->flags)
-                && !u->addr && (err = unix_autobind(sock)) != 0)
+        if (test_bit(SOCK_PASSCRED, &sock->flags) && !u->addr
+            && (err = unix_autobind(sock)) != 0)
                 goto out;
 
         err = -EMSGSIZE;
@@ -2216,14 +2217,14 @@ static const struct file_operations unix_seq_fops = {
 
 #endif
 
-static struct net_proto_family unix_family_ops = {
+static const struct net_proto_family unix_family_ops = {
         .family = PF_UNIX,
         .create = unix_create,
         .owner  = THIS_MODULE,
 };
 
 
-static int unix_net_init(struct net *net)
+static int __net_init unix_net_init(struct net *net)
 {
         int error = -ENOMEM;
 
@@ -2242,7 +2243,7 @@ out:
         return error;
 }
 
-static void unix_net_exit(struct net *net)
+static void __net_exit unix_net_exit(struct net *net)
 {
         unix_sysctl_unregister(net);
         proc_net_remove(net, "unix");
diff --git a/net/unix/garbage.c b/net/unix/garbage.c
index 19c17e4a0c8b..14c22c3768da 100644
--- a/net/unix/garbage.c
+++ b/net/unix/garbage.c
@@ -74,7 +74,6 @@
 #include <linux/un.h>
 #include <linux/net.h>
 #include <linux/fs.h>
-#include <linux/slab.h>
 #include <linux/skbuff.h>
 #include <linux/netdevice.h>
 #include <linux/file.h>
diff --git a/net/unix/sysctl_net_unix.c b/net/unix/sysctl_net_unix.c
index 83c093077ebc..397cffebb3b6 100644
--- a/net/unix/sysctl_net_unix.c
+++ b/net/unix/sysctl_net_unix.c
@@ -10,29 +10,29 @@
  */
 
 #include <linux/mm.h>
+#include <linux/slab.h>
 #include <linux/sysctl.h>
 
 #include <net/af_unix.h>
 
 static ctl_table unix_table[] = {
         {
-                .ctl_name       = NET_UNIX_MAX_DGRAM_QLEN,
                 .procname       = "max_dgram_qlen",
                 .data           = &init_net.unx.sysctl_max_dgram_qlen,
                 .maxlen         = sizeof(int),
                 .mode           = 0644,
                 .proc_handler   = proc_dointvec
         },
-        { .ctl_name = 0 }
+        { }
 };
 
 static struct ctl_path unix_path[] = {
-        { .procname = "net", .ctl_name = CTL_NET, },
-        { .procname = "unix", .ctl_name = NET_UNIX, },
+        { .procname = "net", },
+        { .procname = "unix", },
         { },
 };
 
-int unix_sysctl_register(struct net *net)
+int __net_init unix_sysctl_register(struct net *net)
 {
         struct ctl_table *table;