diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2022-04-28 09:50:29 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-04-28 09:50:29 -0700 |
| commit | 4a2316a1eda4ef3ced18c7f08f7cb3726bcae44b (patch) | |
| tree | a9d3c6fc5c9d2ae459332c39fca076d13605a6ed | |
| parent | 8061e16e203f36e7a5990535760ecb2e60a365f9 (diff) | |
| parent | 296abc0d91d8b65d42224dd33452ace14491ad08 (diff) | |
Merge tag 'gfs2-v5.18-rc4-fix2' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2
Pull gfs2 fix from Andreas Gruenbacher:
- No short reads or writes upon glock contention
* tag 'gfs2-v5.18-rc4-fix2' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2:
gfs2: No short reads or writes upon glock contention
| -rw-r--r-- | fs/gfs2/file.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/fs/gfs2/file.c b/fs/gfs2/file.c index 8d889235afcd..48f01323c37c 100644 --- a/fs/gfs2/file.c +++ b/fs/gfs2/file.c @@ -991,8 +991,6 @@ retry_under_glock: if (leftover != window_size) { if (gfs2_holder_queued(&gh)) goto retry_under_glock; - if (written) - goto out_uninit; goto retry; } } @@ -1069,8 +1067,6 @@ retry_under_glock: from->count = min(from->count, window_size - leftover); if (gfs2_holder_queued(gh)) goto retry_under_glock; - if (read && !(iocb->ki_flags & IOCB_DIRECT)) - goto out_uninit; goto retry; } } |