From: Andreas Gruenbacher <agruenba@redhat.com>
Date: Fri, 25 Aug 2023 09:06:20 +0000 (+0200)
Subject: gfs2: Switch to wait_event in gfs2_quotad
X-Git-Tag: v6.6.17~3982^2~29
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e4a8b5481c59a3f1252f595330c2d2cd038886b2;p=platform%2Fkernel%2Flinux-rpi.git

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 <agruenba@redhat.com>
---

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;