Skip to content

Commit 4a2316a

Browse files
committed
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
2 parents 8061e16 + 296abc0 commit 4a2316a

File tree

1 file changed

+0
-4
lines changed

1 file changed

+0
-4
lines changed

fs/gfs2/file.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -991,8 +991,6 @@ static ssize_t gfs2_file_read_iter(struct kiocb *iocb, struct iov_iter *to)
991991
if (leftover != window_size) {
992992
if (gfs2_holder_queued(&gh))
993993
goto retry_under_glock;
994-
if (written)
995-
goto out_uninit;
996994
goto retry;
997995
}
998996
}
@@ -1069,8 +1067,6 @@ static ssize_t gfs2_file_buffered_write(struct kiocb *iocb,
10691067
from->count = min(from->count, window_size - leftover);
10701068
if (gfs2_holder_queued(gh))
10711069
goto retry_under_glock;
1072-
if (read && !(iocb->ki_flags & IOCB_DIRECT))
1073-
goto out_uninit;
10741070
goto retry;
10751071
}
10761072
}

0 commit comments

Comments
 (0)