korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-29 07:04:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

io_uring: convert epoll to io_cmd_type

Browse Source 
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Jens Axboe 2022-05-24 10:01:09 -06:00
parent bb040a21fd
commit 3e93a3571a
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
io_uring/io_uring.c
View File

@ -980,7 +980,6 @@ struct io_kiocb {
struct file *file; struct file *file;
struct io_cmd_data cmd; struct io_cmd_data cmd;
struct io_rsrc_update rsrc_update; struct io_rsrc_update rsrc_update;
struct io_epoll epoll;
struct io_splice splice; struct io_splice splice;
struct io_provide_buf pbuf; struct io_provide_buf pbuf;
struct io_msg msg; struct io_msg msg;
@ -5577,18 +5576,20 @@ static int io_epoll_ctl_prep(struct io_kiocb *req,
const struct io_uring_sqe *sqe) const struct io_uring_sqe *sqe)
{ {
#if defined(CONFIG_EPOLL) #if defined(CONFIG_EPOLL)
struct io_epoll *epoll = io_kiocb_to_cmd(req);
if (sqe->buf_index || sqe->splice_fd_in) if (sqe->buf_index || sqe->splice_fd_in)
return -EINVAL; return -EINVAL;
req->epoll.epfd = READ_ONCE(sqe->fd); epoll->epfd = READ_ONCE(sqe->fd);
req->epoll.op = READ_ONCE(sqe->len); epoll->op = READ_ONCE(sqe->len);
req->epoll.fd = READ_ONCE(sqe->off); epoll->fd = READ_ONCE(sqe->off);
if (ep_op_has_event(req->epoll.op)) { if (ep_op_has_event(epoll->op)) {
struct epoll_event __user *ev; struct epoll_event __user *ev;
ev = u64_to_user_ptr(READ_ONCE(sqe->addr)); ev = u64_to_user_ptr(READ_ONCE(sqe->addr));
if (copy_from_user(&req->epoll.event, ev, sizeof(*ev))) if (copy_from_user(&epoll->event, ev, sizeof(*ev)))
return -EFAULT; return -EFAULT;
} }
@ -5601,7 +5602,7 @@ static int io_epoll_ctl_prep(struct io_kiocb *req,
static int io_epoll_ctl(struct io_kiocb *req, unsigned int issue_flags) static int io_epoll_ctl(struct io_kiocb *req, unsigned int issue_flags)
{ {
#if defined(CONFIG_EPOLL) #if defined(CONFIG_EPOLL)
struct io_epoll *ie = &req->epoll; struct io_epoll *ie = io_kiocb_to_cmd(req);
int ret; int ret;
bool force_nonblock = issue_flags & IO_URING_F_NONBLOCK; bool force_nonblock = issue_flags & IO_URING_F_NONBLOCK;