X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fosp%2Fosp_internal.h;h=799ef207fd400c6e399dc050038211af9f7582a5;hb=refs%2Fchanges%2F56%2F6956%2F8;hp=847a1005f1ff3d6b74c1254820728a487b0fb18c;hpb=1b2547843817b4b7adbeb87ea9b070d9cac35c90;p=fs%2Flustre-release.git

diff --git a/lustre/osp/osp_internal.h b/lustre/osp/osp_internal.h
index 847a100..799ef20 100644
--- a/lustre/osp/osp_internal.h
+++ b/lustre/osp/osp_internal.h
@@ -119,9 +119,9 @@ struct osp_device {
 	/* dedicate precreate thread */
 	struct ptlrpc_thread		 opd_pre_thread;
 	/* thread waits for signals about pool going empty */
-	cfs_waitq_t			 opd_pre_waitq;
+	wait_queue_head_t		 opd_pre_waitq;
 	/* consumers (who needs new ids) wait here */
-	cfs_waitq_t			 opd_pre_user_waitq;
+	wait_queue_head_t		 opd_pre_user_waitq;
 	/* current precreation status: working, failed, stopping? */
 	int				 opd_pre_status;
 	/* how many to precreate next time */
@@ -145,7 +145,7 @@ struct osp_device {
 	int				 opd_syn_prev_done;
 	/* found records */
 	struct ptlrpc_thread		 opd_syn_thread;
-	cfs_waitq_t			 opd_syn_waitq;
+	wait_queue_head_t		 opd_syn_waitq;
 	/* list of remotely committed rpc */
 	cfs_list_t			 opd_syn_committed_there;
 	/* number of changes being under sync */
@@ -173,7 +173,7 @@ struct osp_device {
 	 */
 	struct obd_statfs		 opd_statfs;
 	cfs_time_t			 opd_statfs_fresh_till;
-	cfs_timer_t			 opd_statfs_timer;
+	struct timer_list			 opd_statfs_timer;
 	int				 opd_statfs_update_in_progress;
 	/* how often to update statfs data */
 	int				 opd_statfs_maxage;