From patchwork Mon Oct 10 23:43:30 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Roesch X-Patchwork-Id: 13003435 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 24DF0C4332F for ; Tue, 11 Oct 2022 00:00:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229624AbiJKAAx (ORCPT ); Mon, 10 Oct 2022 20:00:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40070 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229827AbiJKAAr (ORCPT ); Mon, 10 Oct 2022 20:00:47 -0400 X-Greylist: delayed 1020 seconds by postgrey-1.37 at lindbergh.monkeyblade.net; Mon, 10 Oct 2022 17:00:45 PDT Received: from 66-220-144-178.mail-mxout.facebook.com (66-220-144-178.mail-mxout.facebook.com [66.220.144.178]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 39980804AA for ; Mon, 10 Oct 2022 17:00:44 -0700 (PDT) Received: by dev1180.prn1.facebook.com (Postfix, from userid 425415) id AE96134B23D5; Mon, 10 Oct 2022 16:43:32 -0700 (PDT) From: Stefan Roesch To: kernel-team@fb.com, io-uring@vger.kernel.org Cc: shr@devkernel.io, axboe@kernel.dk, kernel test robot Subject: [PATCH v1] io_uring: local variable rw shadows outer variable in io_write Date: Mon, 10 Oct 2022 16:43:30 -0700 Message-Id: <20221010234330.244244-1-shr@devkernel.io> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: io-uring@vger.kernel.org This fixes the shadowing of the outer variable rw in the function io_write(). Reported-by: kernel test robot Signed-off-by: Stefan Roesch --- io_uring/rw.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) base-commit: e2302539dd4f1c62d96651c07ddb05aa2461d29c 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);