Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'work.aio' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull aio fixes from Al Viro:
"Assorted AIO followups and fixes"
* 'work.aio' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
eventpoll: switch to ->poll_mask
aio: only return events requested in poll_mask() for IOCB_CMD_POLL
eventfd: only return events requested in poll_mask()
aio: mark __aio_sigset::sigmask const
+15
-10
+2
-2
fs/aio.c
+2
-2
fs/aio.c
···
1661
1661
if (mask && !(mask & req->events))
1662
1662
return 0;
1663
1663
1664
-
mask = file->f_op->poll_mask(file, req->events);
1664
+
mask = file->f_op->poll_mask(file, req->events) & req->events;
1665
1665
if (!mask)
1666
1666
return 0;
1667
1667
···
1719
1719
1720
1720
spin_lock_irq(&ctx->ctx_lock);
1721
1721
spin_lock(&req->head->lock);
1722
-
mask = req->file->f_op->poll_mask(req->file, req->events);
1722
+
mask = req->file->f_op->poll_mask(req->file, req->events) & req->events;
1723
1723
if (!mask) {
1724
1724
__add_wait_queue(req->head, &req->wait);
1725
1725
list_add_tail(&aiocb->ki_list, &ctx->active_reqs);
+2
-2
fs/eventfd.c
+2
-2
fs/eventfd.c
···
156
156
count = READ_ONCE(ctx->count);
157
157
158
158
if (count > 0)
159
-
events |= EPOLLIN;
159
+
events |= (EPOLLIN & eventmask);
160
160
if (count == ULLONG_MAX)
161
161
events |= EPOLLERR;
162
162
if (ULLONG_MAX - 1 > count)
163
-
events |= EPOLLOUT;
163
+
events |= (EPOLLOUT & eventmask);
164
164
165
165
return events;
166
166
}
+10
-5
fs/eventpoll.c
+10
-5
fs/eventpoll.c
···
922
922
return 0;
923
923
}
924
924
925
-
static __poll_t ep_eventpoll_poll(struct file *file, poll_table *wait)
925
+
static struct wait_queue_head *ep_eventpoll_get_poll_head(struct file *file,
926
+
__poll_t eventmask)
927
+
{
928
+
struct eventpoll *ep = file->private_data;
929
+
return &ep->poll_wait;
930
+
}
931
+
932
+
static __poll_t ep_eventpoll_poll_mask(struct file *file, __poll_t eventmask)
926
933
{
927
934
struct eventpoll *ep = file->private_data;
928
935
int depth = 0;
929
-
930
-
/* Insert inside our poll wait queue */
931
-
poll_wait(file, &ep->poll_wait, wait);
932
936
933
937
/*
934
938
* Proceed to find out if wanted events are really available inside
···
972
968
.show_fdinfo = ep_show_fdinfo,
973
969
#endif
974
970
.release = ep_eventpoll_release,
975
-
.poll = ep_eventpoll_poll,
971
+
.get_poll_head = ep_eventpoll_get_poll_head,
972
+
.poll_mask = ep_eventpoll_poll_mask,
976
973
.llseek = noop_llseek,
977
974
};
978
975