1 files changed, 26 insertions, 36 deletions

diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c
index 0214acbd6bff..68bb70a62afe 100644
--- a/net/unix/af_unix.c
+++ b/net/unix/af_unix.c
@@ -415,9 +415,9 @@ static void unix_dgram_peer_wake_disconnect_wakeup(struct sock *sk,
 {
         unix_dgram_peer_wake_disconnect(sk, other);
         wake_up_interruptible_poll(sk_sleep(sk),
-                                   POLLOUT |
-                                   POLLWRNORM |
-                                   POLLWRBAND);
+                                   EPOLLOUT |
+                                   EPOLLWRNORM |
+                                   EPOLLWRBAND);
 }
 
 /* preconditions:
@@ -454,7 +454,7 @@ static void unix_write_space(struct sock *sk)
                 wq = rcu_dereference(sk->sk_wq);
                 if (skwq_has_sleeper(wq))
                         wake_up_interruptible_sync_poll(&wq->wait,
-                                POLLOUT | POLLWRNORM | POLLWRBAND);
+                                EPOLLOUT | EPOLLWRNORM | EPOLLWRBAND);
                 sk_wake_async(sk, SOCK_WAKE_SPACE, POLL_OUT);
         }
         rcu_read_unlock();
@@ -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))
 
@@ -2129,8 +2119,8 @@ static int unix_dgram_recvmsg(struct socket *sock, struct msghdr *msg,
 
         if (wq_has_sleeper(&u->peer_wait))
                 wake_up_interruptible_sync_poll(&u->peer_wait,
-                                                POLLOUT | POLLWRNORM |
-                                                POLLWRBAND);
+                                                EPOLLOUT | EPOLLWRNORM |
+                                                EPOLLWRBAND);
 
         if (msg->msg_name)
                 unix_copy_addr(msg, skb->sk);
@@ -2650,27 +2640,27 @@ static __poll_t unix_poll(struct file *file, struct socket *sock, poll_table *wa
 
         /* exceptional events? */
         if (sk->sk_err)
-                mask |= POLLERR;
+                mask |= EPOLLERR;
         if (sk->sk_shutdown == SHUTDOWN_MASK)
-                mask |= POLLHUP;
+                mask |= EPOLLHUP;
         if (sk->sk_shutdown & RCV_SHUTDOWN)
-                mask |= POLLRDHUP | POLLIN | POLLRDNORM;
+                mask |= EPOLLRDHUP | EPOLLIN | EPOLLRDNORM;
 
         /* readable? */
         if (!skb_queue_empty(&sk->sk_receive_queue))
-                mask |= POLLIN | POLLRDNORM;
+                mask |= EPOLLIN | EPOLLRDNORM;
 
         /* Connection-based need to check for termination and startup */
         if ((sk->sk_type == SOCK_STREAM || sk->sk_type == SOCK_SEQPACKET) &&
             sk->sk_state == TCP_CLOSE)
-                mask |= POLLHUP;
+                mask |= EPOLLHUP;
 
         /*
          * we set writable also when the other side has shut down the
          * connection. This prevents stuck sockets.
          */
         if (unix_writable(sk))
-                mask |= POLLOUT | POLLWRNORM | POLLWRBAND;
+                mask |= EPOLLOUT | EPOLLWRNORM | EPOLLWRBAND;
 
         return mask;
 }
@@ -2687,29 +2677,29 @@ static __poll_t unix_dgram_poll(struct file *file, struct socket *sock,
 
         /* exceptional events? */
         if (sk->sk_err || !skb_queue_empty(&sk->sk_error_queue))
-                mask |= POLLERR |
-                        (sock_flag(sk, SOCK_SELECT_ERR_QUEUE) ? POLLPRI : 0);
+                mask |= EPOLLERR |
+                        (sock_flag(sk, SOCK_SELECT_ERR_QUEUE) ? EPOLLPRI : 0);
 
         if (sk->sk_shutdown & RCV_SHUTDOWN)
-                mask |= POLLRDHUP | POLLIN | POLLRDNORM;
+                mask |= EPOLLRDHUP | EPOLLIN | EPOLLRDNORM;
         if (sk->sk_shutdown == SHUTDOWN_MASK)
-                mask |= POLLHUP;
+                mask |= EPOLLHUP;
 
         /* readable? */
         if (!skb_queue_empty(&sk->sk_receive_queue))
-                mask |= POLLIN | POLLRDNORM;
+                mask |= EPOLLIN | EPOLLRDNORM;
 
         /* Connection-based need to check for termination and startup */
         if (sk->sk_type == SOCK_SEQPACKET) {
                 if (sk->sk_state == TCP_CLOSE)
-                        mask |= POLLHUP;
+                        mask |= EPOLLHUP;
                 /* connection hasn't started yet? */
                 if (sk->sk_state == TCP_SYN_SENT)
                         return mask;
         }
 
         /* No write status requested, avoid expensive OUT tests. */
-        if (!(poll_requested_events(wait) & (POLLWRBAND|POLLWRNORM|POLLOUT)))
+        if (!(poll_requested_events(wait) & (EPOLLWRBAND|EPOLLWRNORM|EPOLLOUT)))
                 return mask;
 
         writable = unix_writable(sk);
@@ -2726,7 +2716,7 @@ static __poll_t unix_dgram_poll(struct file *file, struct socket *sock,
         }
 
         if (writable)
-                mask |= POLLOUT | POLLWRNORM | POLLWRBAND;
+                mask |= EPOLLOUT | EPOLLWRNORM | EPOLLWRBAND;
         else
                 sk_set_bit(SOCKWQ_ASYNC_NOSPACE, sk);