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=-12.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,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 B0CCAC00A89 for ; Mon, 2 Nov 2020 18:43:59 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 37D742225E for ; Mon, 2 Nov 2020 18:43:56 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="hzZgkNvB" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 37D742225E 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 63AFA6B0088; Mon, 2 Nov 2020 13:43:35 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 5C38A6B0089; Mon, 2 Nov 2020 13:43:35 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4B7896B008A; Mon, 2 Nov 2020 13:43:35 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0065.hostedemail.com [216.40.44.65]) by kanga.kvack.org (Postfix) with ESMTP id 1691C6B0089 for ; Mon, 2 Nov 2020 13:43:35 -0500 (EST) Received: from smtpin28.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id A731A3630 for ; Mon, 2 Nov 2020 18:43:34 +0000 (UTC) X-FDA: 77440351548.28.walk15_2c05168272b2 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin28.hostedemail.com (Postfix) with ESMTP id 7E8596C36 for ; Mon, 2 Nov 2020 18:43:34 +0000 (UTC) X-HE-Tag: walk15_2c05168272b2 X-Filterd-Recvd-Size: 2933 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf27.hostedemail.com (Postfix) with ESMTP for ; Mon, 2 Nov 2020 18:43:34 +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=yGyAJgqIZQghEE7oZN0iVtA30eQFmzuryM2GY/sRLrw=; b=hzZgkNvB2NLMB2hjkr63NI85rq 6Wyh3yajoMs5mWxCOEx2ZXWUsmWlGpWSwJIWzJ7pBIXp3YLddBe7c4NGDdcCluTQ1hQtMycoW33Lo mmUx1XfJnruzkutworpYU8T6FTnevOCz7vWvOM4JU97YYLScdlsWWwHqayMS/hhfkEYhGq8y1uX8J aS4CA+6E1YiKbZDCD29bHo0ohcbqXyx5Lh3yf9FVgzUrOE1dsFkEC/ki2ll9N1pk+BEUUGP35crQl piv4IY6qlf/lYa7Rnr8rBBsRkFgu6LIR2jMoSP0jnAx4TMQEyZK4Y50726gKhtNB1eXvQckl0Zj+S sAt0LXvw==; Received: from willy by casper.infradead.org with local (Exim 4.92.3 #3 (Red Hat Linux)) id 1kZenj-0006rN-Vk; Mon, 02 Nov 2020 18:43:32 +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 17/17] mm: simplify generic_file_read_iter Date: Mon, 2 Nov 2020 18:43:12 +0000 Message-Id: <20201102184312.25926-18-willy@infradead.org> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20201102184312.25926-1-willy@infradead.org> References: <20201102184312.25926-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) --- mm/filemap.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/mm/filemap.c b/mm/filemap.c index 92bb308029c3..4676ce15a9a5 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -2549,7 +2549,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; @@ -2567,7 +2567,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); @@ -2590,12 +2590,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.28.0