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=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable 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 9124CC433E6 for ; Wed, 24 Feb 2021 20:05:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 453B664F1B for ; Wed, 24 Feb 2021 20:05:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230121AbhBXUE7 (ORCPT ); Wed, 24 Feb 2021 15:04:59 -0500 Received: from mail.kernel.org ([198.145.29.99]:55904 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235409AbhBXUDH (ORCPT ); Wed, 24 Feb 2021 15:03:07 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id 2480D64F1F; Wed, 24 Feb 2021 20:02:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1614196966; bh=AqNbbROry6vyOab/G1XkUcbNgncY1pD+FBLjyRYrMJI=; h=Date:From:To:Subject:In-Reply-To:From; b=RkbuNlgcJhCawzGExEhirDoZ1gmw5tf2B4jHVl00A9PYYH3a4Jk9QTCbm5NR6+z6W E8ymh/vomdXWa9/1q4u26WbSK5iRyS650G+ypvBnVGqPVQK4u4fYQOA+vWsw/f7wkM yWRMFVro4YAWagIKtxEcxbWid5OKez0QW3Qqx8Ag= Date: Wed, 24 Feb 2021 12:02:45 -0800 From: Andrew Morton To: akpm@linux-foundation.org, hch@lst.de, kent.overstreet@gmail.com, linmiaohe@huawei.com, linux-mm@kvack.org, mm-commits@vger.kernel.org, torvalds@linux-foundation.org, willy@infradead.org Subject: [patch 047/173] mm/filemap: simplify generic_file_read_iter Message-ID: <20210224200245.GVV1PLlJl%akpm@linux-foundation.org> In-Reply-To: <20210224115824.1e289a6895087f10c41dd8d6@linux-foundation.org> User-Agent: s-nail v14.8.16 Precedence: bulk Reply-To: linux-kernel@vger.kernel.org List-ID: X-Mailing-List: mm-commits@vger.kernel.org From: Christoph Hellwig Subject: mm/filemap: simplify generic_file_read_iter Avoid the pointless goto out just for returning retval. Link: https://lkml.kernel.org/r/20210122160140.223228-19-willy@infradead.org Signed-off-by: Christoph Hellwig Signed-off-by: Matthew Wilcox (Oracle) Reviewed-by: Kent Overstreet Cc: Miaohe Lin Signed-off-by: Andrew Morton --- mm/filemap.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) --- a/mm/filemap.c~mm-filemap-simplify-generic_file_read_iter +++ a/mm/filemap.c @@ -2543,7 +2543,7 @@ generic_file_read_iter(struct kiocb *ioc ssize_t retval = 0; if (!count) - goto out; /* skip atime */ + return 0; /* skip atime */ if (iocb->ki_flags & IOCB_DIRECT) { struct file *file = iocb->ki_filp; @@ -2561,7 +2561,7 @@ generic_file_read_iter(struct kiocb *ioc iocb->ki_pos, iocb->ki_pos + count - 1); if (retval < 0) - goto out; + return retval; } file_accessed(file); @@ -2585,12 +2585,10 @@ generic_file_read_iter(struct kiocb *ioc */ if (retval < 0 || !count || iocb->ki_pos >= size || IS_DAX(inode)) - goto out; + return retval; } - retval = filemap_read(iocb, iter, retval); -out: - return retval; + return filemap_read(iocb, iter, retval); } EXPORT_SYMBOL(generic_file_read_iter); _