io_uring: local variable rw shadows outer variable in io_write
authorStefan Roesch <shr@devkernel.io>
Mon, 10 Oct 2022 23:43:30 +0000 (16:43 -0700)
committerJens Axboe <axboe@kernel.dk>
Wed, 12 Oct 2022 22:30:56 +0000 (16:30 -0600)
This fixes the shadowing of the outer variable rw in the function
io_write(). No issue is caused by this, but let's silence the shadowing
warning anyway.

Reported-by: kernel test robot <lkp@intel.com>
Signed-off-by: Stefan Roesch <shr@devkernel.io>
Link: https://lore.kernel.org/r/20221010234330.244244-1-shr@devkernel.io
Signed-off-by: Jens Axboe <axboe@kernel.dk>
io_uring/rw.c

index a25cd44cd41531bbf38bcd263f4f2874c61ec0cf..453e0ae921609f4c708cdcf5ac31fe1781ee5b33 100644 (file)
@@ -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);