1 files changed, 6 insertions, 16 deletions

diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c
index d545e1d0dea2..68bb70a62afe 100644
--- a/net/unix/af_unix.c
+++ b/net/unix/af_unix.c
@@ -637,7 +637,7 @@ static int unix_stream_connect(struct socket *, struct sockaddr *,
                                int addr_len, int flags);
 static int unix_socketpair(struct socket *, struct socket *);
 static int unix_accept(struct socket *, struct socket *, int, bool);
-static int unix_getname(struct socket *, struct sockaddr *, int *, int);
+static int unix_getname(struct socket *, struct sockaddr *, int);
 static __poll_t unix_poll(struct file *, struct socket *, poll_table *);
 static __poll_t unix_dgram_poll(struct file *, struct socket *,
                                     poll_table *);
@@ -745,14 +745,6 @@ static struct proto unix_proto = {
         .obj_size               = sizeof(struct unix_sock),
 };
 
-/*
- * AF_UNIX sockets do not interact with hardware, hence they
- * dont trigger interrupts - so it's safe for them to have
- * bh-unsafe locking for their sk_receive_queue.lock. Split off
- * this special lock-class by reinitializing the spinlock key:
- */
-static struct lock_class_key af_unix_sk_receive_queue_lock_key;
-
 static struct sock *unix_create1(struct net *net, struct socket *sock, int kern)
 {
         struct sock *sk = NULL;
@@ -767,8 +759,6 @@ static struct sock *unix_create1(struct net *net, struct socket *sock, int kern)
                 goto out;
 
         sock_init_data(sock, sk);
-        lockdep_set_class(&sk->sk_receive_queue.lock,
-                                &af_unix_sk_receive_queue_lock_key);
 
         sk->sk_allocation       = GFP_KERNEL_ACCOUNT;
         sk->sk_write_space      = unix_write_space;
@@ -1453,7 +1443,7 @@ out:
 }
 
 
-static int unix_getname(struct socket *sock, struct sockaddr *uaddr, int *uaddr_len, int peer)
+static int unix_getname(struct socket *sock, struct sockaddr *uaddr, int peer)
 {
         struct sock *sk = sock->sk;
         struct unix_sock *u;
@@ -1476,12 +1466,12 @@ static int unix_getname(struct socket *sock, struct sockaddr *uaddr, int *uaddr_
         if (!u->addr) {
                 sunaddr->sun_family = AF_UNIX;
                 sunaddr->sun_path[0] = 0;
-                *uaddr_len = sizeof(short);
+                err = sizeof(short);
         } else {
                 struct unix_address *addr = u->addr;
 
-                *uaddr_len = addr->len;
-                memcpy(sunaddr, addr->name, *uaddr_len);
+                err = addr->len;
+                memcpy(sunaddr, addr->name, addr->len);
         }
         unix_state_unlock(sk);
         sock_put(sk);
@@ -1825,7 +1815,7 @@ out:
 }
 
 /* We use paged skbs for stream sockets, and limit occupancy to 32768
- * bytes, and a minimun of a full page.
+ * bytes, and a minimum of a full page.
  */
 #define UNIX_SKB_FRAGS_SZ (PAGE_SIZE << get_order(32768))