Skip to content

Commit 1166183

Browse files
author
Andreas Gruenbacher
committed
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 1d45bb7 ("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>
1 parent 46f3e04 commit 1166183

1 file changed

Lines changed: 3 additions & 6 deletions

File tree

fs/gfs2/file.c

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -951,12 +951,9 @@ static ssize_t gfs2_file_read_iter(struct kiocb *iocb, struct iov_iter *to)
951951
* and retry.
952952
*/
953953

954-
if (iocb->ki_flags & IOCB_DIRECT) {
955-
ret = gfs2_file_direct_read(iocb, to, &gh);
956-
if (likely(ret != -ENOTBLK))
957-
return ret;
958-
iocb->ki_flags &= ~IOCB_DIRECT;
959-
}
954+
if (iocb->ki_flags & IOCB_DIRECT)
955+
return gfs2_file_direct_read(iocb, to, &gh);
956+
960957
pagefault_disable();
961958
iocb->ki_flags |= IOCB_NOIO;
962959
ret = generic_file_read_iter(iocb, to);

0 commit comments

Comments
 (0)