diff mbox series

[5.11,10/31] io_uring: simplify do_read return parsing

Message ID	20210319121747.534509392@linuxfoundation.org
State	New
Headers	show Return-Path: <stable-owner@kernel.org> From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, stable@vger.kernel.org, Pavel Begunkov <asml.silence@gmail.com>, Jens Axboe <axboe@kernel.dk>, Sasha Levin <sashal@kernel.org> Subject: [PATCH 5.11 10/31] io_uring: simplify do_read return parsing Date: Fri, 19 Mar 2021 13:19:04 +0100 Message-Id: <20210319121747.534509392@linuxfoundation.org> In-Reply-To: <20210319121747.203523570@linuxfoundation.org> References: <20210319121747.203523570@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	None \| expand [5.11,02/31] KVM: x86/mmu: Expand on the comment in kvm_vcpu_ad_need_write_protect() [5.11,03/31] KVM: x86/mmu: Set SPTE_AD_WRPROT_ONLY_MASK if and only if PML is enabled [5.11,04/31] mptcp: send ack for every add_addr [5.11,05/31] mptcp: pm: add lockdep assertions [5.11,06/31] mptcp: dispose initial struct socket when its subflow is closed [5.11,07/31] io_uring: refactor scheduling in io_cqring_wait [5.11,08/31] io_uring: refactor io_cqring_wait [5.11,09/31] io_uring: dont keep looping for more events if we cant flush overflow [5.11,10/31] io_uring: simplify do_read return parsing [5.11,11/31] io_uring: clear IOCB_WAITQ for non -EIOCBQUEUED return [5.11,12/31] gpiolib: Read "gpio-line-names" from a firmware node [5.11,13/31] net: bonding: fix error return code of bond_neigh_init() [5.11,14/31] regulator: pca9450: Add SD_VSEL GPIO for LDO5 [5.11,15/31] regulator: pca9450: Enable system reset on WDOG_B assertion [5.11,16/31] regulator: pca9450: Clear PRESET_EN bit to fix BUCK1/2/3 voltage setting [5.11,17/31] gfs2: Add common helper for holding and releasing the freeze glock [5.11,18/31] gfs2: move freeze glock outside the make_fs_rw and _ro functions [5.11,19/31] gfs2: bypass signal_our_withdraw if no journal [5.11,20/31] bpf: Prohibit alu ops for pointer types not defining ptr_limit [5.11,21/31] bpf: Fix off-by-one for area size in creating mask to left [5.11,22/31] bpf: Simplify alu_limit masking for pointer arithmetic [5.11,23/31] bpf: Add sanity check for upper ptr_limit [5.11,24/31] bpf, selftests: Fix up some test_verifier cases for unprivileged [5.11,25/31] arm64: Unconditionally set virtual cpu id registers [5.11,26/31] RDMA/srp: Fix support for unpopulated and unbalanced NUMA nodes [5.11,27/31] fuse: fix live lock in fuse_iget() [5.11,28/31] Revert "nfsd4: remove check_conflicting_opens warning" [5.11,29/31] Revert "nfsd4: a clients own opens neednt prevent delegations" [5.11,30/31] net: dsa: b53: Support setting learning on port [5.11,31/31] crypto: x86/aes-ni-xts - use direct calls to and 4-way stride

Commit Message

Greg KH March 19, 2021, 12:19 p.m. UTC

From: Pavel Begunkov <asml.silence@gmail.com>

[ Upstream commit 57cd657b8272a66277c139e7bbdc8b86057cb415 ]

do_read() returning 0 bytes read (not -EAGAIN/etc.) is not an important
enough of a case to prioritise it. Fold it into ret < 0 check, so we get
rid of an extra if and make it a bit more readable.

Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
 fs/io_uring.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff mbox series

Patch

diff --git a/fs/io_uring.c b/fs/io_uring.c
index cab380a337e4..c18e4a334614 100644
--- a/fs/io_uring.c
+++ b/fs/io_uring.c
@@ -3518,7 +3518,6 @@  static int io_read(struct io_kiocb *req, bool force_nonblock,
 	else
 		kiocb->ki_flags |= IOCB_NOWAIT;
 
-
 	/* If the file doesn't support async, just async punt */
 	no_async = force_nonblock && !io_file_supports_async(req->file, READ);
 	if (no_async)
@@ -3530,9 +3529,7 @@  static int io_read(struct io_kiocb *req, bool force_nonblock,
 
 	ret = io_iter_do_read(req, iter);
 
-	if (!ret) {
-		goto done;
-	} else if (ret == -EIOCBQUEUED) {
+	if (ret == -EIOCBQUEUED) {
 		ret = 0;
 		goto out_free;
 	} else if (ret == -EAGAIN) {
@@ -3546,7 +3543,7 @@  static int io_read(struct io_kiocb *req, bool force_nonblock,
 		iov_iter_revert(iter, io_size - iov_iter_count(iter));
 		ret = 0;
 		goto copy_iov;
-	} else if (ret < 0) {
+	} else if (ret <= 0) {
 		/* make sure -ERESTARTSYS -> -EINTR is done */
 		goto done;
 	}