diff options
| author | Kevin Hao <haokexin@gmail.com> | 2023-12-18 13:35:58 +0800 |
|---|---|---|
| committer | Andreas Gruenbacher <agruenba@redhat.com> | 2023-12-21 22:53:46 +0100 |
| commit | edd13270fa0660fda608b5f2bf989c770d90d469 (patch) | |
| tree | 825538b4681c2831414a9d16738d693c939986ca /fs/gfs2 | |
| parent | 76e7211ca129f6a9117ae88c020a4c1cafaa24cc (diff) | |
gfs2: Use wait_event_freezable_timeout() for freezable kthread
A freezable kernel thread can enter frozen state during freezing by
either calling try_to_freeze() or using wait_event_freezable() and its
variants. So for the following snippet of code in a kernel thread loop:
try_to_freeze();
wait_event_interruptible_timeout();
We can change it to a simple wait_event_freezable_timeout() and then
eliminate a function call.
Signed-off-by: Kevin Hao <haokexin@gmail.com>
Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com>
Diffstat (limited to 'fs/gfs2')
| -rw-r--r-- | fs/gfs2/log.c | 4 | ||||
| -rw-r--r-- | fs/gfs2/quota.c | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/fs/gfs2/log.c b/fs/gfs2/log.c index 860176989751..6b3ba8f7b67a 100644 --- a/fs/gfs2/log.c +++ b/fs/gfs2/log.c @@ -1337,9 +1337,7 @@ int gfs2_logd(void *data) t = gfs2_tune_get(sdp, gt_logd_secs) * HZ; - try_to_freeze(); - - t = wait_event_interruptible_timeout(sdp->sd_logd_waitq, + t = wait_event_freezable_timeout(sdp->sd_logd_waitq, test_bit(SDF_FORCE_AIL_FLUSH, &sdp->sd_flags) || gfs2_ail_flush_reqd(sdp) || gfs2_jrnl_flush_reqd(sdp) || diff --git a/fs/gfs2/quota.c b/fs/gfs2/quota.c index 1da9a600db7e..ac40b81ee526 100644 --- a/fs/gfs2/quota.c +++ b/fs/gfs2/quota.c @@ -1603,11 +1603,9 @@ int gfs2_quotad(void *data) quotad_check_timeo(sdp, "sync", gfs2_quota_sync, t, "ad_timeo, &tune->gt_quota_quantum); - try_to_freeze(); - t = min(quotad_timeo, statfs_timeo); - t = wait_event_interruptible_timeout(sdp->sd_quota_wait, + t = wait_event_freezable_timeout(sdp->sd_quota_wait, sdp->sd_statfs_force_sync || gfs2_withdrawing_or_withdrawn(sdp) || kthread_should_stop(), |