From patchwork Mon Nov 2 18:43:12 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Wilcox X-Patchwork-Id: 11874959 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id DAB8B1130 for ; Mon, 2 Nov 2020 18:44:22 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 8B8FE22275 for ; Mon, 2 Nov 2020 18:44:07 +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 8B8FE22275 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) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 5C38A6B0089; Mon, 2 Nov 2020 13:43:35 -0500 (EST) X-Original-To: int-list-linux-mm@kvack.org 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-Original-To: linux-mm@kvack.org 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-Spam-Summary: 1,0,0,7359712ac2f35695,d41d8cd98f00b204,willy@infradead.org,,RULES_HIT:41:355:379:541:800:960:973:988:989:1260:1311:1314:1345:1359:1437:1515:1534:1541:1711:1730:1747:1777:1792:2194:2199:2393:2559:2562:3138:3139:3140:3141:3142:3352:3865:4321:4605:5007:6261:6653:7576:8603:10004:11026:11658:11914:12043:12114:12296:12297:12438:12555:12679:12895:13069:13311:13357:13894:14096:14181:14384:14394:14721:21080:21451:21627:21990:30054,0,RBL:90.155.50.34:@infradead.org:.lbl8.mailshell.net-64.201.201.201 62.8.15.100;04y8umq3s6ujrtaobrbgfn9pnkiu3yphe5cxjzif91b1fphj1bh1jnmocx8goi5.5y1b6yk9yx1yzc1tdggrto5appjskmgk565nwi3s9j6577o3cn33uwcqmq75866.n-lbl8.mailshell.net-223.238.255.100,CacheIP:none,Bayesian:0.5,0.5,0.5,Netcheck:none,DomainCache:0,MSF:not bulk,SPF:fn,MSBL:0,DNSBL:neutral,Custom_rules:0:0:0,LFtime:66,LUA_SUMMARY:none 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 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 92bb308029c3..4676ce15a9a5 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -2549,7 +2549,7 @@ generic_file_read_iter(struct kiocb *iocb, struct iov_iter *iter) 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; @@ -2567,7 +2567,7 @@ generic_file_read_iter(struct kiocb *iocb, struct iov_iter *iter) iocb->ki_pos, iocb->ki_pos + count - 1); if (retval < 0) - goto out; + return retval; } 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 >= 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);