fs: add new vfs_poll and file_can_poll helpers

These abstract out calls to the poll method in preparation for changes
in how we poll.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>

1 files changed, 4 insertions, 14 deletions

diff --git a/net/9p/trans_fd.c b/net/9p/trans_fd.c
index 0cfba919d167..3811775692d0 100644
--- a/net/9p/trans_fd.c
+++ b/net/9p/trans_fd.c
@@ -231,7 +231,7 @@ static void p9_conn_cancel(struct p9_conn *m, int err)
 static __poll_t
 p9_fd_poll(struct p9_client *client, struct poll_table_struct *pt, int *err)
 {
-        __poll_t ret, n;
+        __poll_t ret;
         struct p9_trans_fd *ts = NULL;
 
         if (client && client->status == Connected)
@@ -243,19 +243,9 @@ p9_fd_poll(struct p9_client *client, struct poll_table_struct *pt, int *err)
                 return EPOLLERR;
         }
 
-        if (!ts->rd->f_op->poll)
-                ret = DEFAULT_POLLMASK;
-        else
-                ret = ts->rd->f_op->poll(ts->rd, pt);
-
-        if (ts->rd != ts->wr) {
-                if (!ts->wr->f_op->poll)
-                        n = DEFAULT_POLLMASK;
-                else
-                        n = ts->wr->f_op->poll(ts->wr, pt);
-                ret = (ret & ~EPOLLOUT) | (n & ~EPOLLIN);
-        }
-
+        ret = vfs_poll(ts->rd, pt);
+        if (ts->rd != ts->wr)
+                ret = (ret & ~EPOLLOUT) | (vfs_poll(ts->wr, pt) & ~EPOLLIN);
         return ret;
 }