• Jens Axboe's avatar
    io_uring: fix warnings on shadow variables · 1da2f311
    Jens Axboe authored
    There are a few of those:
    
    io_uring/fdinfo.c:170:16: warning: declaration shadows a local variable [-Wshadow]
      170 |                 struct file *f = io_file_from_index(&ctx->file_table, i);
          |                              ^
    io_uring/fdinfo.c:53:67: note: previous declaration is here
       53 | __cold void io_uring_show_fdinfo(struct seq_file *m, struct file *f)
          |                                                                   ^
    io_uring/cancel.c:187:25: warning: declaration shadows a local variable [-Wshadow]
      187 |                 struct io_uring_task *tctx = node->task->io_uring;
          |                                       ^
    io_uring/cancel.c:166:31: note: previous declaration is here
      166 |                              struct io_uring_task *tctx,
          |                                                    ^
    io_uring/register.c:371:25: warning: declaration shadows a local variable [-Wshadow]
      371 |                 struct io_uring_task *tctx = node->task->io_uring;
          |                                       ^
    io_uring/register.c:312:24: note: previous declaration is here
      312 |         struct io_uring_task *tctx = NULL;
          |                               ^
    
    and a simple cleanup gets rid of them. For the fdinfo case, make a
    distinction between the file being passed in (for the ring), and the
    registered files we iterate. For the other two cases, just get rid of
    shadowed variable, there's no reason to have a new one.
    Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
    1da2f311
register.c 13.9 KB