From: Andreas Gruenbacher <agruenba@redhat.com>
Date: Thu, 24 Mar 2022 21:40:20 +0000 (+0100)
Subject: gfs2: Remove dead code in gfs2_file_read_iter
X-Git-Tag: v5.18-rc1~39^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=11661835f90153bdfc5325e550d2b72d0f47cb3e;p=thirdparty%2Fkernel%2Flinux.git

gfs2: Remove dead code in gfs2_file_read_iter

Function iomap_dio_rw() only returns -ENOTBLK for write requests and
gfs2_file_direct_read() no longer returns -ENOTBLK since commit
1d45bb7f9d2a5 ("gfs2: Use iomap for stuffed direct I/O reads"), so there
is no need to check for -ENOTBLK in gfs2_file_read_iter() anymore.

Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com>
---

diff --git a/fs/gfs2/file.c b/fs/gfs2/file.c
index 19a038bc33bc2..edc588465a4b6 100644
--- a/fs/gfs2/file.c
+++ b/fs/gfs2/file.c
@@ -951,12 +951,9 @@ static ssize_t gfs2_file_read_iter(struct kiocb *iocb, struct iov_iter *to)
 	 * and retry.
 	 */
 
-	if (iocb->ki_flags & IOCB_DIRECT) {
-		ret = gfs2_file_direct_read(iocb, to, &gh);
-		if (likely(ret != -ENOTBLK))
-			return ret;
-		iocb->ki_flags &= ~IOCB_DIRECT;
-	}
+	if (iocb->ki_flags & IOCB_DIRECT)
+		return gfs2_file_direct_read(iocb, to, &gh);
+
 	pagefault_disable();
 	iocb->ki_flags |= IOCB_NOIO;
 	ret = generic_file_read_iter(iocb, to);