Merge branch 'work.aio-1' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[linux] / net / dccp / proto.c

diff --git a/net/dccp/proto.c b/net/dccp/proto.c
index 0d56e36..ca21c1c 100644 (file)
--- a/net/dccp/proto.c
+++ b/net/dccp/proto.c
@@ -312,20 +312,11 @@ int dccp_disconnect(struct sock *sk, int flags)
 
 EXPORT_SYMBOL_GPL(dccp_disconnect);
 
-/*
- *     Wait for a DCCP event.
- *
- *     Note that we don't need to lock the socket, as the upper poll layers
- *     take care of normal races (between the test and the event) and we don't
- *     go look at any of the socket buffers directly.
- */
-__poll_t dccp_poll(struct file *file, struct socket *sock,
-                      poll_table *wait)
+__poll_t dccp_poll_mask(struct socket *sock, __poll_t events)
 {
        __poll_t mask;
        struct sock *sk = sock->sk;
 
-       sock_poll_wait(file, sk_sleep(sk), wait);
        if (sk->sk_state == DCCP_LISTEN)
                return inet_csk_listen_poll(sk);
 
@@ -367,7 +358,7 @@ __poll_t dccp_poll(struct file *file, struct socket *sock,
        return mask;
 }
 
-EXPORT_SYMBOL_GPL(dccp_poll);
+EXPORT_SYMBOL_GPL(dccp_poll_mask);
 
 int dccp_ioctl(struct sock *sk, int cmd, unsigned long arg)
 {