From: "Matthew Wilcox (Oracle)" <willy@infradead.org>
To: linux-fsdevel@vger.kernel.org, linux-mm@kvack.org
Cc: Christoph Hellwig <hch@lst.de>,
kent.overstreet@gmail.com, Matthew Wilcox <willy@infradead.org>
Subject: [PATCH v4 18/18] mm/filemap: Simplify generic_file_read_iter
Date: Thu, 21 Jan 2021 04:16:16 +0000 [thread overview]
Message-ID: <20210121041616.3955703-19-willy@infradead.org> (raw)
In-Reply-To: <20210121041616.3955703-1-willy@infradead.org>
From: Christoph Hellwig <hch@lst.de>
Avoid the pointless goto out just for returning retval.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Reviewed-by: Kent Overstreet <kent.overstreet@gmail.com>
---
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 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;
@@ -2547,7 +2547,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);
@@ -2570,12 +2570,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);
--
2.29.2
prev parent reply other threads:[~2021-01-21 4:35 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-21 4:15 [PATCH v4 00/18] Refactor generic_file_buffered_read Matthew Wilcox (Oracle)
2021-01-21 4:15 ` [PATCH v4 01/18] mm/filemap: Rename generic_file_buffered_read subfunctions Matthew Wilcox (Oracle)
2021-01-21 7:30 ` Christoph Hellwig
2021-01-21 8:23 ` Miaohe Lin
2021-01-21 4:16 ` [PATCH v4 02/18] mm/filemap: Remove dynamically allocated array from filemap_read Matthew Wilcox (Oracle)
2021-01-21 7:31 ` Christoph Hellwig
2021-01-22 6:59 ` Miaohe Lin
2021-01-21 4:16 ` [PATCH v4 03/18] mm/filemap: Convert filemap_get_pages to take a pagevec Matthew Wilcox (Oracle)
2021-01-21 7:31 ` Christoph Hellwig
2021-01-21 4:16 ` [PATCH v4 04/18] mm/filemap: Use head pages in generic_file_buffered_read Matthew Wilcox (Oracle)
2021-01-21 4:16 ` [PATCH v4 05/18] mm/filemap: Pass a sleep state to put_and_wait_on_page_locked Matthew Wilcox (Oracle)
2021-01-21 4:16 ` [PATCH v4 06/18] mm/filemap: Support readpage splitting a page Matthew Wilcox (Oracle)
2021-01-21 4:16 ` [PATCH v4 07/18] mm/filemap: Inline __wait_on_page_locked_async into caller Matthew Wilcox (Oracle)
2021-01-21 4:16 ` [PATCH v4 08/18] mm/filemap: Don't call ->readpage if IOCB_WAITQ is set Matthew Wilcox (Oracle)
2021-01-21 4:16 ` [PATCH v4 09/18] mm/filemap: Change filemap_read_page calling conventions Matthew Wilcox (Oracle)
2021-01-21 7:31 ` Christoph Hellwig
2021-01-21 4:16 ` [PATCH v4 10/18] mm/filemap: Change filemap_create_page " Matthew Wilcox (Oracle)
2021-01-21 4:16 ` [PATCH v4 11/18] mm/filemap: Convert filemap_update_page to return an errno Matthew Wilcox (Oracle)
2021-01-21 7:32 ` Christoph Hellwig
2021-01-21 4:16 ` [PATCH v4 12/18] mm/filemap: Move the iocb checks into filemap_update_page Matthew Wilcox (Oracle)
2021-01-21 4:16 ` [PATCH v4 13/18] mm/filemap: Add filemap_range_uptodate Matthew Wilcox (Oracle)
2021-01-21 7:32 ` Christoph Hellwig
2021-01-21 4:16 ` [PATCH v4 14/18] mm/filemap: Split filemap_readahead out of filemap_get_pages Matthew Wilcox (Oracle)
2021-01-21 7:33 ` Christoph Hellwig
2021-01-21 4:16 ` [PATCH v4 15/18] mm/filemap: Restructure filemap_get_pages Matthew Wilcox (Oracle)
2021-01-21 7:33 ` Christoph Hellwig
2021-01-21 4:16 ` [PATCH v4 16/18] mm/filemap: Don't relock the page after calling readpage Matthew Wilcox (Oracle)
2021-01-21 7:34 ` Christoph Hellwig
2021-01-21 4:16 ` [PATCH v4 17/18] mm/filemap: Rename generic_file_buffered_read to filemap_read Matthew Wilcox (Oracle)
2021-01-21 4:16 ` Matthew Wilcox (Oracle) [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210121041616.3955703-19-willy@infradead.org \
--to=willy@infradead.org \
--cc=hch@lst.de \
--cc=kent.overstreet@gmail.com \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-mm@kvack.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).