[PATCH v5 18/18] mm/filemap: Simplify generic_file_read_iter

[Matthew Wilcox (Oracle)]

From: Christoph Hellwig <h...@lst.de>

Avoid the pointless goto out just for returning retval.

Signed-off-by: Christoph Hellwig <h...@lst.de>
Signed-off-by: Matthew Wilcox (Oracle) <wi...@infradead.org>
Reviewed-by: Kent Overstreet <kent.overstr...@gmail.com>
---
 mm/filemap.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/mm/filemap.c b/mm/filemap.c
index ef910eca9e1a2..f5903494cf173 100644
--- a/mm/filemap.c
+++ b/mm/filemap.c
@@ -2555,7 +2555,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;
@@ -2573,7 +2573,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);
@@ -2597,12 +2597,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