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

[platform/kernel/linux-rpi.git] / fs / eventpoll.c

diff --git a/fs/eventpoll.c b/fs/eventpoll.c
index d89aead..10b81e6 100644 (file)
--- a/fs/eventpoll.c
+++ b/fs/eventpoll.c
@@ -394,7 +394,8 @@ static void ep_busy_loop(struct eventpoll *ep, int nonblock)
        unsigned int napi_id = READ_ONCE(ep->napi_id);
 
        if ((napi_id >= MIN_NAPI_ID) && net_busy_loop_on())
-               napi_busy_loop(napi_id, nonblock ? NULL : ep_busy_loop_end, ep);
+               napi_busy_loop(napi_id, nonblock ? NULL : ep_busy_loop_end, ep, false,
+                              BUSY_POLL_BUDGET);
 }
 
 static inline void ep_reset_busy_poll_napi_id(struct eventpoll *ep)
@@ -412,12 +413,11 @@ static inline void ep_set_busy_poll_napi_id(struct epitem *epi)
        unsigned int napi_id;
        struct socket *sock;
        struct sock *sk;
-       int err;
 
        if (!net_busy_loop_on())
                return;
 
-       sock = sock_from_file(epi->ffd.file, &err);
+       sock = sock_from_file(epi->ffd.file);
        if (!sock)
                return;