gfs2: Fix "gfs2: Switch to wait_event in gfs2_quotad"

Commit e4a8b5481c59a ("gfs2: Switch to wait_event in gfs2_quotad") broke
cyclic statfs syncing, so the numbers reported by "df" could easily get
completely out of sync with reality.  Fix this by reverting part of
commit e4a8b5481c59a for now.

A follow-up commit will clean this code up later.

Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com>

diff --git a/fs/gfs2/quota.c b/fs/gfs2/quota.c
index 2298e06797ac38967d91d95389cba5f9f2fceb7e..f2df01f801b811a1175e98c1b58696309b7abced 100644 (file)
--- a/fs/gfs2/quota.c
+++ b/fs/gfs2/quota.c
@@ -1616,7 +1616,7 @@ int gfs2_quotad(void *data)
 
                t = min(quotad_timeo, statfs_timeo);
 
-               t = wait_event_freezable_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(),