Revert "io_uring: disable polling pollfree files"

Fix early boot crash. This reverts commit fc78b2f.
frno7 · Mar 7, 2024 · b364d55 · b364d55
1 parent f5a3a13
commit b364d55
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 6 deletions.
diff --git a/drivers/android/binder.c b/drivers/android/binder.c
@@ -6095,7 +6095,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)

diff --git a/fs/io_uring.c b/fs/io_uring.c
@@ -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)

diff --git a/fs/signalfd.c b/fs/signalfd.c
@@ -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)

diff --git a/include/linux/fs.h b/include/linux/fs.h
@@ -1859,7 +1859,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;
 } __randomize_layout;
 
 struct inode_operations {