Revert "io_uring: disable polling pollfree files"

This reverts commit fc78b2fc21.

This breaks the Android api and for now, does not seem to be necessary
due to the lack of io_uring users in this kernel branch.  If io_uring
starts to be used more, it can be brought back in a ABI-safe way.

Bug: 161946584
Bug: 248008710
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I2696bd5e1ad61d3ab0e8d06f4ffe46718bb05845
This commit is contained in:
Greg Kroah-Hartman 2022-09-21 13:33:57 +02:00
parent cfe83da8bd
commit d60223937b
4 changed files with 0 additions and 6 deletions

View File

@ -6027,7 +6027,6 @@ const struct file_operations binder_fops = {
.open = binder_open,
.flush = binder_flush,
.release = binder_release,
.may_pollfree = true,
};
static int __init init_binder_device(const char *name)

View File

@ -1908,9 +1908,6 @@ static int io_poll_add(struct io_kiocb *req, const struct io_uring_sqe *sqe)
__poll_t mask;
u16 events;
if (req->file->f_op->may_pollfree)
return -EOPNOTSUPP;
if (unlikely(req->ctx->flags & IORING_SETUP_IOPOLL))
return -EINVAL;
if (sqe->addr || sqe->ioprio || sqe->off || sqe->len || sqe->buf_index)

View File

@ -248,7 +248,6 @@ static const struct file_operations signalfd_fops = {
.poll = signalfd_poll,
.read = signalfd_read,
.llseek = noop_llseek,
.may_pollfree = true,
};
static int do_signalfd4(int ufd, sigset_t *mask, int flags)

View File

@ -1907,7 +1907,6 @@ struct file_operations {
struct file *file_out, loff_t pos_out,
loff_t len, unsigned int remap_flags);
int (*fadvise)(struct file *, loff_t, loff_t, int);
bool may_pollfree;
ANDROID_KABI_RESERVE(1);
ANDROID_KABI_RESERVE(2);