Skip to content

Commit 296abc0

Browse files
author
Andreas Gruenbacher
committed
gfs2: No short reads or writes upon glock contention
Commit 00bfe02 ("gfs2: Fix mmap + page fault deadlocks for buffered I/O") changed gfs2_file_read_iter() and gfs2_file_buffered_write() to allow dropping the inode glock while faulting in user buffers. When the lock was dropped, a short result was returned to indicate that the operation was interrupted. As pointed out by Linus (see the link below), this behavior is broken and the operations should always re-acquire the inode glock and resume the operation instead. Link: https://lore.kernel.org/lkml/CAHk-=whaz-g_nOOoo8RRiWNjnv2R+h6_xk2F1J4TuSRxk1MtLw@mail.gmail.com/ Fixes: 00bfe02 ("gfs2: Fix mmap + page fault deadlocks for buffered I/O") Signed-off-by: Andreas Gruenbacher <[email protected]>
1 parent 4fad37d commit 296abc0

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)