Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1d45bb7f authored by Andreas Gruenbacher's avatar Andreas Gruenbacher
Browse files

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: default avatarAndreas Gruenbacher <agruenba@redhat.com>
Reviewed-by: default avatarBob Peterson <rpeterso@redhat.com>
parent 0ed91eca
Loading
Loading
Loading
Loading
+0 −6
Original line number Diff line number Diff line
@@ -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);