From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3BEBBC433E0 for ; Thu, 21 Jan 2021 04:33:06 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id B036823788 for ; Thu, 21 Jan 2021 04:33:05 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B036823788 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=infradead.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 320756B000D; Wed, 20 Jan 2021 23:33:05 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 2D1386B000E; Wed, 20 Jan 2021 23:33:05 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1C0CB6B0010; Wed, 20 Jan 2021 23:33:05 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0086.hostedemail.com [216.40.44.86]) by kanga.kvack.org (Postfix) with ESMTP id 04E716B000D for ; Wed, 20 Jan 2021 23:33:05 -0500 (EST) Received: from smtpin16.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id C1948181AEF3E for ; Thu, 21 Jan 2021 04:33:04 +0000 (UTC) X-FDA: 77728512288.16.help96_550bd5227560 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin16.hostedemail.com (Postfix) with ESMTP id A1B12100E6903 for ; Thu, 21 Jan 2021 04:33:04 +0000 (UTC) X-HE-Tag: help96_550bd5227560 X-Filterd-Recvd-Size: 3008 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf09.hostedemail.com (Postfix) with ESMTP for ; Thu, 21 Jan 2021 04:33:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=rpTvJL1A2NKaaXMolrRyE/n5dCLdNDYCD9/y3G0JDA8=; b=asA5cEYNDJQcFBV8NKMmwBe9iE zXDb8RPzqCKNwkATsnFAOOn8xcnliFmzlQ1r7vNsfREH7CLbS4jwABsWiv6fOHQwzNKATfpMOcFHO avBgF6pCKIhEPpXT8S4OW5s/yW3+ITKhId7Qn3fclXnVRtxZrnpZTSH0ToeAC0lPQDw/WVGSuHI6N Cp+YWp0mXfjMbXWuB+9itXvzPqtVE/ZucLlWsGeD8CocCjddR07zcFMo/pOzBUydUe0oW/S5bEHEz u0do8qq6ymK/lIjojPFikgl906Qw+wY+9+GSH2AZZBKxOspKKrYFl4BhP6Gkb/LUunD56Ey+MEGDJ 4ZPdtSqQ==; Received: from willy by casper.infradead.org with local (Exim 4.94 #2 (Red Hat Linux)) id 1l2RcW-00GbuN-7e; Thu, 21 Jan 2021 04:31:18 +0000 From: "Matthew Wilcox (Oracle)" To: linux-fsdevel@vger.kernel.org, linux-mm@kvack.org Cc: Christoph Hellwig , kent.overstreet@gmail.com, Matthew Wilcox Subject: [PATCH v4 18/18] mm/filemap: Simplify generic_file_read_iter Date: Thu, 21 Jan 2021 04:16:16 +0000 Message-Id: <20210121041616.3955703-19-willy@infradead.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210121041616.3955703-1-willy@infradead.org> References: <20210121041616.3955703-1-willy@infradead.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: From: Christoph Hellwig Avoid the pointless goto out just for returning retval. Signed-off-by: Christoph Hellwig Signed-off-by: Matthew Wilcox (Oracle) Reviewed-by: Kent Overstreet --- mm/filemap.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/mm/filemap.c b/mm/filemap.c index 50d87aff0ef86..bcaaaf7f55ab7 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -2529,7 +2529,7 @@ generic_file_read_iter(struct kiocb *iocb, struct i= ov_iter *iter) ssize_t retval =3D 0; =20 if (!count) - goto out; /* skip atime */ + return 0; /* skip atime */ =20 if (iocb->ki_flags & IOCB_DIRECT) { struct file *file =3D iocb->ki_filp; @@ -2547,7 +2547,7 @@ generic_file_read_iter(struct kiocb *iocb, struct i= ov_iter *iter) iocb->ki_pos, iocb->ki_pos + count - 1); if (retval < 0) - goto out; + return retval; } =20 file_accessed(file); @@ -2570,12 +2570,10 @@ generic_file_read_iter(struct kiocb *iocb, struct= iov_iter *iter) */ if (retval < 0 || !count || iocb->ki_pos >=3D size || IS_DAX(inode)) - goto out; + return retval; } =20 - retval =3D filemap_read(iocb, iter, retval); -out: - return retval; + return filemap_read(iocb, iter, retval); } EXPORT_SYMBOL(generic_file_read_iter); =20 --=20 2.29.2