From: Andreas Gruenbacher <agruenba@redhat.com>
Date: Wed, 27 Jun 2018 00:59:18 +0000 (+0100)
Subject: gfs2: Use iomap for stuffed direct I/O reads
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=1d45bb7f9d2a5cbae1e5d9a5f72adad84db4d318;p=linux.git

gfs2: Use iomap for stuffed direct I/O reads

Remove the fallback code from direct to buffered I/O for stuffed reads.

For stuffed writes, we must keep the fallback code: the deferred glock
we are holding under direct I/O doesn't allow to write to the inode or
change the file size.

Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com>
Reviewed-by: Bob Peterson <rpeterso@redhat.com>
---

diff --git a/fs/gfs2/file.c b/fs/gfs2/file.c
index 6d895d39158ac..08369c6cd127a 100644
--- a/fs/gfs2/file.c
+++ b/fs/gfs2/file.c
@@ -706,14 +706,8 @@ static ssize_t gfs2_file_direct_read(struct kiocb *iocb, struct iov_iter *to)
 	if (ret)
 		goto out_uninit;
 
-	/* fall back to buffered I/O for stuffed files */
-	ret = -ENOTBLK;
-	if (gfs2_is_stuffed(ip))
-		goto out;
-
 	ret = iomap_dio_rw(iocb, to, &gfs2_iomap_ops, NULL);
 
-out:
 	gfs2_glock_dq(&gh);
 out_uninit:
 	gfs2_holder_uninit(&gh);