vfs: do bulk POLL* -> EPOLL* replacement

[linux-block.git] / net / vmw_vsock / af_vsock.c

diff --git a/net/vmw_vsock/af_vsock.c b/net/vmw_vsock/af_vsock.c
index 9d95e773f4c8c0b3cda5963c383455d663ba28e8..e0fc84daed944b7753a11b8d8629a78380425414 100644 (file)
--- a/net/vmw_vsock/af_vsock.c
+++ b/net/vmw_vsock/af_vsock.c
@@ -865,20 +865,20 @@ static __poll_t vsock_poll(struct file *file, struct socket *sock,
 
        if (sk->sk_err)
                /* Signify that there has been an error on this socket. */
-               mask |= POLLERR;
+               mask |= EPOLLERR;
 
        /* INET sockets treat local write shutdown and peer write shutdown as a
-        * case of POLLHUP set.
+        * case of EPOLLHUP set.
         */
        if ((sk->sk_shutdown == SHUTDOWN_MASK) ||
            ((sk->sk_shutdown & SEND_SHUTDOWN) &&
             (vsk->peer_shutdown & SEND_SHUTDOWN))) {
-               mask |= POLLHUP;
+               mask |= EPOLLHUP;
        }
 
        if (sk->sk_shutdown & RCV_SHUTDOWN ||
            vsk->peer_shutdown & SEND_SHUTDOWN) {
-               mask |= POLLRDHUP;
+               mask |= EPOLLRDHUP;
        }
 
        if (sock->type == SOCK_DGRAM) {
@@ -888,11 +888,11 @@ static __poll_t vsock_poll(struct file *file, struct socket *sock,
                 */
                if (!skb_queue_empty(&sk->sk_receive_queue) ||
                    (sk->sk_shutdown & RCV_SHUTDOWN)) {
-                       mask |= POLLIN | POLLRDNORM;
+                       mask |= EPOLLIN | EPOLLRDNORM;
                }
 
                if (!(sk->sk_shutdown & SEND_SHUTDOWN))
-                       mask |= POLLOUT | POLLWRNORM | POLLWRBAND;
+                       mask |= EPOLLOUT | EPOLLWRNORM | EPOLLWRBAND;
 
        } else if (sock->type == SOCK_STREAM) {
                lock_sock(sk);
@@ -902,7 +902,7 @@ static __poll_t vsock_poll(struct file *file, struct socket *sock,
                 */
                if (sk->sk_state == TCP_LISTEN
                    && !vsock_is_accept_queue_empty(sk))
-                       mask |= POLLIN | POLLRDNORM;
+                       mask |= EPOLLIN | EPOLLRDNORM;
 
                /* If there is something in the queue then we can read. */
                if (transport->stream_is_active(vsk) &&
@@ -911,10 +911,10 @@ static __poll_t vsock_poll(struct file *file, struct socket *sock,
                        int ret = transport->notify_poll_in(
                                        vsk, 1, &data_ready_now);
                        if (ret < 0) {
-                               mask |= POLLERR;
+                               mask |= EPOLLERR;
                        } else {
                                if (data_ready_now)
-                                       mask |= POLLIN | POLLRDNORM;
+                                       mask |= EPOLLIN | EPOLLRDNORM;
 
                        }
                }
@@ -925,7 +925,7 @@ static __poll_t vsock_poll(struct file *file, struct socket *sock,
                 */
                if (sk->sk_shutdown & RCV_SHUTDOWN ||
                    vsk->peer_shutdown & SEND_SHUTDOWN) {
-                       mask |= POLLIN | POLLRDNORM;
+                       mask |= EPOLLIN | EPOLLRDNORM;
                }
 
                /* Connected sockets that can produce data can be written. */
@@ -935,25 +935,25 @@ static __poll_t vsock_poll(struct file *file, struct socket *sock,
                                int ret = transport->notify_poll_out(
                                                vsk, 1, &space_avail_now);
                                if (ret < 0) {
-                                       mask |= POLLERR;
+                                       mask |= EPOLLERR;
                                } else {
                                        if (space_avail_now)
-                                               /* Remove POLLWRBAND since INET
+                                               /* Remove EPOLLWRBAND since INET
                                                 * sockets are not setting it.
                                                 */
-                                               mask |= POLLOUT | POLLWRNORM;
+                                               mask |= EPOLLOUT | EPOLLWRNORM;
 
                                }
                        }
                }
 
                /* Simulate INET socket poll behaviors, which sets
-                * POLLOUT|POLLWRNORM when peer is closed and nothing to read,
+                * EPOLLOUT|EPOLLWRNORM when peer is closed and nothing to read,
                 * but local send is not shutdown.
                 */
                if (sk->sk_state == TCP_CLOSE || sk->sk_state == TCP_CLOSING) {
                        if (!(sk->sk_shutdown & SEND_SHUTDOWN))
-                               mask |= POLLOUT | POLLWRNORM;
+                               mask |= EPOLLOUT | EPOLLWRNORM;
 
                }