X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fmdt%2Fmdt_coordinator.c;h=f98ec0ef79c47886a88c2bc592d3790b133a8e7e;hb=e089a515efae3391709b997be889ebe0f3306e9d;hp=95437e2b1f0d4908b4fda8a5a4171884e2a7c723;hpb=8c47378b057e72d6125f4baffe8721e0734d0d3f;p=fs%2Flustre-release.git

diff --git a/lustre/mdt/mdt_coordinator.c b/lustre/mdt/mdt_coordinator.c
index 95437e2..f98ec0e 100644
--- a/lustre/mdt/mdt_coordinator.c
+++ b/lustre/mdt/mdt_coordinator.c
@@ -422,7 +422,7 @@ static int mdt_coordinator(void *data)
 	ENTRY;
 
 	cdt->cdt_thread.t_flags = SVC_RUNNING;
-	cfs_waitq_signal(&cdt->cdt_thread.t_ctl_waitq);
+	wake_up(&cdt->cdt_thread.t_ctl_waitq);
 
 	CDEBUG(D_HSM, "%s: coordinator thread starting, pid=%d\n",
 	       mdt_obd_name(mdt), current_pid());
@@ -652,7 +652,7 @@ out:
 		 * and cdt cleaning will be done by event sender
 		 */
 		cdt->cdt_thread.t_flags = SVC_STOPPED;
-		cfs_waitq_signal(&cdt->cdt_thread.t_ctl_waitq);
+		wake_up(&cdt->cdt_thread.t_ctl_waitq);
 	}
 
 	if (rc != 0)
@@ -820,7 +820,7 @@ int mdt_hsm_cdt_wakeup(struct mdt_device *mdt)
 
 	/* wake up coordinator */
 	cdt->cdt_thread.t_flags = SVC_EVENT;
-	cfs_waitq_signal(&cdt->cdt_thread.t_ctl_waitq);
+	wake_up(&cdt->cdt_thread.t_ctl_waitq);
 
 	RETURN(0);
 }
@@ -840,7 +840,7 @@ int mdt_hsm_cdt_init(struct mdt_device *mdt)
 
 	cdt->cdt_state = CDT_STOPPED;
 
-	cfs_waitq_init(&cdt->cdt_thread.t_ctl_waitq);
+	init_waitqueue_head(&cdt->cdt_thread.t_ctl_waitq);
 	mutex_init(&cdt->cdt_llog_lock);
 	init_rwsem(&cdt->cdt_agent_lock);
 	init_rwsem(&cdt->cdt_request_lock);
@@ -956,7 +956,7 @@ int mdt_hsm_cdt_start(struct mdt_device *mdt)
 		rc = 0;
 	}
 
-	cfs_wait_event(cdt->cdt_thread.t_ctl_waitq,
+	wait_event(cdt->cdt_thread.t_ctl_waitq,
 		       (cdt->cdt_thread.t_flags & SVC_RUNNING));
 
 	cdt->cdt_state = CDT_RUNNING;
@@ -990,9 +990,9 @@ int mdt_hsm_cdt_stop(struct mdt_device *mdt)
 	if (cdt->cdt_state != CDT_STOPPING) {
 		/* stop coordinator thread before cleaning */
 		cdt->cdt_thread.t_flags = SVC_STOPPING;
-		cfs_waitq_signal(&cdt->cdt_thread.t_ctl_waitq);
-		cfs_wait_event(cdt->cdt_thread.t_ctl_waitq,
-			       cdt->cdt_thread.t_flags & SVC_STOPPED);
+		wake_up(&cdt->cdt_thread.t_ctl_waitq);
+		wait_event(cdt->cdt_thread.t_ctl_waitq,
+			   cdt->cdt_thread.t_flags & SVC_STOPPED);
 	}
 	cdt->cdt_state = CDT_STOPPED;