Skip to content

Commit

Permalink
io_uring: local variable rw shadows outer variable in io_write
Browse files Browse the repository at this point in the history
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 <[email protected]>
Signed-off-by: Stefan Roesch <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Jens Axboe <[email protected]>
  • Loading branch information
Stefan Roesch authored and axboe committed Oct 12, 2022
1 parent 1152849 commit c86416c
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions io_uring/rw.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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);
Expand Down

0 comments on commit c86416c

Please sign in to comment.