* [PATCH v1] io_uring: local variable rw shadows outer variable in io_write
@ 2022-10-10 23:43 Stefan Roesch
2022-10-11 2:54 ` Jens Axboe
0 siblings, 1 reply; 2+ messages in thread
From: Stefan Roesch @ 2022-10-10 23:43 UTC (permalink / raw)
To: kernel-team, io-uring; +Cc: shr, axboe, kernel test robot
This fixes the shadowing of the outer variable rw in the function
io_write().
Reported-by: kernel test robot <[email protected]>
Signed-off-by: Stefan Roesch <[email protected]>
---
io_uring/rw.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/io_uring/rw.c b/io_uring/rw.c
index a25cd44cd415..453e0ae92160 100644
--- a/io_uring/rw.c
+++ b/io_uring/rw.c
@@ -916,7 +916,7 @@ int io_write(struct io_kiocb *req, unsigned int issue_flags)
goto copy_iov;
if (ret2 != req->cqe.res && ret2 >= 0 && need_complete_io(req)) {
- struct io_async_rw *rw;
+ struct io_async_rw *io;
trace_io_uring_short_write(req->ctx, kiocb->ki_pos - ret2,
req->cqe.res, ret2);
@@ -929,9 +929,9 @@ int io_write(struct io_kiocb *req, unsigned int issue_flags)
iov_iter_save_state(&s->iter, &s->iter_state);
ret = io_setup_async_rw(req, iovec, s, true);
- rw = req->async_data;
- if (rw)
- rw->bytes_done += ret2;
+ io = req->async_data;
+ if (io)
+ io->bytes_done += ret2;
if (kiocb->ki_flags & IOCB_WRITE)
kiocb_end_write(req);
base-commit: e2302539dd4f1c62d96651c07ddb05aa2461d29c
--
2.30.2
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-10-11 2:54 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-10-10 23:43 [PATCH v1] io_uring: local variable rw shadows outer variable in io_write Stefan Roesch
2022-10-11 2:54 ` Jens Axboe
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox