Skip to content

Commit 6fa1160

Browse files
chaseyuJaegeuk Kim
authored andcommitted
f2fs: fix timeout precision of f2fs_io_schedule_timeout_killable()
Sometimes, f2fs_io_schedule_timeout_killable(HZ) may delay for about 2 seconds, this is because __f2fs_schedule_timeout(DEFAULT_SCHEDULE_TIMEOUT) may delay for about 2 * DEFAULT_SCHEDULE_TIMEOUT due to its precision, but we only account the delay as DEFAULT_SCHEDULE_TIMEOUT as below, fix it. f2fs_io_schedule_timeout_killable() .. timeout -= DEFAULT_SCHEDULE_TIMEOUT; Signed-off-by: Chao Yu <chao@kernel.org> Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
1 parent da90b67 commit 6fa1160

1 file changed

Lines changed: 3 additions & 4 deletions

File tree

fs/f2fs/f2fs.h

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4985,13 +4985,12 @@ static inline void __f2fs_schedule_timeout(long timeout, bool io)
49854985

49864986
static inline void f2fs_io_schedule_timeout_killable(long timeout)
49874987
{
4988-
while (timeout) {
4988+
unsigned long last_time = jiffies + timeout;
4989+
4990+
while (jiffies < last_time) {
49894991
if (fatal_signal_pending(current))
49904992
return;
49914993
__f2fs_schedule_timeout(DEFAULT_SCHEDULE_TIMEOUT, true);
4992-
if (timeout <= DEFAULT_SCHEDULE_TIMEOUT)
4993-
return;
4994-
timeout -= DEFAULT_SCHEDULE_TIMEOUT;
49954994
}
49964995
}
49974996

0 commit comments

Comments
 (0)