Commit 11661835 authored by Andreas Gruenbacher's avatar Andreas Gruenbacher
Browse files

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
1d45bb7f ("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: default avatarAndreas Gruenbacher <agruenba@redhat.com>
parent 46f3e042

fs/gfs2/file.c

+3 −6
Original line number Diff line number Diff line
@@ -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);