Commit 58f5c8d3 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

io_uring: make apoll_events a __poll_t 



apoll_events is fed to vfs_poll and the poll tables, so it should be
a __poll_t.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Link: https://lore.kernel.org/r/20220518084005.3255380-5-hch@lst.de


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent ee67ba3b

fs/io_uring.c

+4 −3
Original line number Diff line number Diff line
@@ -1011,7 +1011,7 @@ struct io_kiocb { 
		/* used by request caches, completion batching and iopoll */

		struct io_wq_work_node	comp_list;

		/* cache ->apoll->events */

		int apoll_events;

		__poll_t apoll_events;

	};

	atomic_t			refs;

	atomic_t			poll_refs;
@@ -6297,7 +6297,7 @@ static void io_apoll_task_func(struct io_kiocb *req, bool *locked) 
		io_req_complete_failed(req, ret);

}



static void __io_poll_execute(struct io_kiocb *req, int mask, int events)

static void __io_poll_execute(struct io_kiocb *req, int mask, __poll_t events)

{

	req->cqe.res = mask;

	/*
@@ -6316,7 +6316,8 @@ static void __io_poll_execute(struct io_kiocb *req, int mask, int events) 
	io_req_task_work_add(req, false);

}



static inline void io_poll_execute(struct io_kiocb *req, int res, int events)

static inline void io_poll_execute(struct io_kiocb *req, int res,

		__poll_t events)

{

	if (io_poll_get_ownership(req))

		__io_poll_execute(req, res, events);