Merge tag 'v4.16-rc2' into next-general

Sync to Linux 4.16-rc2 for developers to work against.

1 files changed, 28 insertions, 28 deletions

diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c
index a9ee634f3c42..d545e1d0dea2 100644
--- a/net/unix/af_unix.c
+++ b/net/unix/af_unix.c
@@ -367,7 +367,7 @@ static int unix_dgram_peer_wake_relay(wait_queue_entry_t *q, unsigned mode, int
         /* relaying can only happen while the wq still exists */
         u_sleep = sk_sleep(&u->sk);
         if (u_sleep)
-                wake_up_interruptible_poll(u_sleep, key);
+                wake_up_interruptible_poll(u_sleep, key_to_poll(key));
 
         return 0;
 }
@@ -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();
@@ -638,8 +638,8 @@ static int unix_stream_connect(struct socket *, struct sockaddr *,
 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 unsigned int unix_poll(struct file *, struct socket *, poll_table *);
-static unsigned int unix_dgram_poll(struct file *, struct socket *,
+static __poll_t unix_poll(struct file *, struct socket *, poll_table *);
+static __poll_t unix_dgram_poll(struct file *, struct socket *,
                                     poll_table *);
 static int unix_ioctl(struct socket *, unsigned int, unsigned long);
 static int unix_shutdown(struct socket *, int);
@@ -2129,8 +2129,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);
@@ -2640,75 +2640,76 @@ static int unix_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
         return err;
 }
 
-static unsigned int unix_poll(struct file *file, struct socket *sock, poll_table *wait)
+static __poll_t unix_poll(struct file *file, struct socket *sock, poll_table *wait)
 {
         struct sock *sk = sock->sk;
-        unsigned int mask;
+        __poll_t mask;
 
         sock_poll_wait(file, sk_sleep(sk), wait);
         mask = 0;
 
         /* 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;
 }
 
-static unsigned int unix_dgram_poll(struct file *file, struct socket *sock,
+static __poll_t unix_dgram_poll(struct file *file, struct socket *sock,
                                     poll_table *wait)
 {
         struct sock *sk = sock->sk, *other;
-        unsigned int mask, writable;
+        unsigned int writable;
+        __poll_t mask;
 
         sock_poll_wait(file, sk_sleep(sk), wait);
         mask = 0;
 
         /* 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);
@@ -2725,7 +2726,7 @@ static unsigned int 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);
 
@@ -2869,7 +2870,6 @@ static int unix_seq_open(struct inode *inode, struct file *file)
 }
 
 static const struct file_operations unix_seq_fops = {
-        .owner          = THIS_MODULE,
         .open           = unix_seq_open,
         .read           = seq_read,
         .llseek         = seq_lseek,