X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fquota%2Fqsd_writeback.c;h=9a400135e4f574832bdc8c642e5b2a8c96769c88;hb=31170f9ceca91684ea66e0b16757881563a8cf26;hp=048fbd70ab34344b03aaf18286903675e5e35467;hpb=fa9c4d0fee01d30d538a819f370f281431a43f68;p=fs%2Flustre-release.git

diff --git a/lustre/quota/qsd_writeback.c b/lustre/quota/qsd_writeback.c
index 048fbd7..9a40013 100644
--- a/lustre/quota/qsd_writeback.c
+++ b/lustre/quota/qsd_writeback.c
@@ -33,8 +33,6 @@
 #include <linux/kthread.h>
 #include "qsd_internal.h"
 
-extern struct kmem_cache *upd_kmem;
-
 /*
  * Allocate and fill an qsd_upd_rec structure to be processed by the writeback
  * thread.
@@ -435,7 +433,6 @@ static int qsd_upd_thread(void *arg)
 {
 	struct qsd_instance	*qsd = (struct qsd_instance *)arg;
 	struct ptlrpc_thread	*thread = &qsd->qsd_upd_thread;
-	struct l_wait_info	 lwi;
 	struct list_head	 queue;
 	struct qsd_upd_rec	*upd, *n;
 	struct lu_env		*env;
@@ -460,11 +457,12 @@ static int qsd_upd_thread(void *arg)
 	wake_up(&thread->t_ctl_waitq);
 
 	INIT_LIST_HEAD(&queue);
-	lwi = LWI_TIMEOUT(cfs_time_seconds(QSD_WB_INTERVAL), NULL, NULL);
 	while (1) {
-		l_wait_event(thread->t_ctl_waitq,
-			     qsd_job_pending(qsd, &queue, &uptodate) ||
-			     !thread_is_running(thread), &lwi);
+		wait_event_idle_timeout(
+			thread->t_ctl_waitq,
+			qsd_job_pending(qsd, &queue, &uptodate) ||
+			!thread_is_running(thread),
+			cfs_time_seconds(QSD_WB_INTERVAL));
 
 		list_for_each_entry_safe(upd, n, &queue, qur_link) {
 			list_del_init(&upd->qur_link);