From: Andreas Gruenbacher <agruenba@redhat.com>
Date: Thu, 24 Mar 2022 22:13:26 +0000 (+0100)
Subject: gfs2: Make sure not to return short direct writes
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=3bde4c48586074202044456285a97ccdf9048988;p=linux.git

gfs2: Make sure not to return short direct writes

When direct writes fail with -ENOTBLK because we're writing into a
hole (gfs2_iomap_begin()) or because of a page invalidation failure
(iomap_dio_rw()), we're falling back to buffered writes.  In that case,
when we lose the inode glock in gfs2_file_buffered_write(), we want to
re-acquire it instead of returning a short write.

Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com>
---

diff --git a/fs/gfs2/file.c b/fs/gfs2/file.c
index edc588465a4b6..22b41acfbbc39 100644
--- a/fs/gfs2/file.c
+++ b/fs/gfs2/file.c
@@ -1069,7 +1069,7 @@ retry_under_glock:
 			from->count = min(from->count, window_size - leftover);
 			if (gfs2_holder_queued(gh))
 				goto retry_under_glock;
-			if (read)
+			if (read && !(iocb->ki_flags & IOCB_DIRECT))
 				goto out_uninit;
 			goto retry;
 		}