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 19a038bc33bc28ec493843a2fd2e6bfa131ffc24..edc588465a4b6b9bf52e5387b0b3412bc2ad7a09 100644 (file)
--- 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);