From: Pavel Begunkov <asml.silence@gmail.com>
Date: Sun, 21 Jun 2020 10:09:52 +0000 (+0300)
Subject: io_uring: set @poll->file after @poll init
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=b90cd197f9315f968d5ee4e6ee9f4e3067f2c883;p=linux.git

io_uring: set @poll->file after @poll init

It's a good practice to modify fields of a struct after but not before
it was initialised. Even though io_init_poll_iocb() doesn't touch
poll->file, call it first.

Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
---

diff --git a/fs/io_uring.c b/fs/io_uring.c
index 93af915a98e68..cc1f2f3b7bfa8 100644
--- a/fs/io_uring.c
+++ b/fs/io_uring.c
@@ -4596,8 +4596,8 @@ static __poll_t __io_arm_poll_handler(struct io_kiocb *req,
 	struct io_ring_ctx *ctx = req->ctx;
 	bool cancel = false;
 
-	poll->file = req->file;
 	io_init_poll_iocb(poll, mask, wake_func);
+	poll->file = req->file;
 	poll->wait.private = req;
 
 	ipt->pt._key = mask;