From e4a8b5481c59a3f1252f595330c2d2cd038886b2 Mon Sep 17 00:00:00 2001 From: Andreas Gruenbacher Date: Fri, 25 Aug 2023 11:06:20 +0200 Subject: [PATCH] gfs2: Switch to wait_event in gfs2_quotad In gfs2_quotad(), switch from an open-coded wait loop to wait_event_interruptible_timeout(). Signed-off-by: Andreas Gruenbacher --- fs/gfs2/quota.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/fs/gfs2/quota.c b/fs/gfs2/quota.c index 75be0d8..5201bb4 100644 --- a/fs/gfs2/quota.c +++ b/fs/gfs2/quota.c @@ -1557,7 +1557,6 @@ int gfs2_quotad(void *data) unsigned long statfs_timeo = 0; unsigned long quotad_timeo = 0; unsigned long t = 0; - DEFINE_WAIT(wait); while (!kthread_should_stop()) { @@ -1583,12 +1582,12 @@ int gfs2_quotad(void *data) bypass: t = min(quotad_timeo, statfs_timeo); - prepare_to_wait(&sdp->sd_quota_wait, &wait, TASK_INTERRUPTIBLE); - if (!sdp->sd_statfs_force_sync) - t -= schedule_timeout(t); - else + t = wait_event_interruptible_timeout(sdp->sd_quota_wait, + sdp->sd_statfs_force_sync, + t); + + if (sdp->sd_statfs_force_sync) t = 0; - finish_wait(&sdp->sd_quota_wait, &wait); } return 0; -- 2.7.4