diff --git a/fs/gfs2/quota.c b/fs/gfs2/quota.c
index 171b2713d2e5..73d522d7c81b 100644
--- a/fs/gfs2/quota.c
+++ b/fs/gfs2/quota.c
@@ -1501,9 +1501,8 @@ void gfs2_quota_cleanup(struct gfs2_sbd *sdp)
 
 	gfs2_qd_list_dispose(&dispose);
 
-	wait_event_timeout(sdp->sd_kill_wait,
-		(count = atomic_read(&sdp->sd_quota_count)) == 0,
-		HZ * 60);
+	wait_event(sdp->sd_kill_wait,
+		(count = atomic_read(&sdp->sd_quota_count)) == 0);
 
 	if (count != 0)
 		fs_err(sdp, "%d left-over quota data objects\n", count);