diff options
Diffstat (limited to 'drivers')
6 files changed, 17 insertions, 22 deletions
diff --git a/drivers/staging/lustre/include/linux/libcfs/libcfs_prim.h b/drivers/staging/lustre/include/linux/libcfs/libcfs_prim.h index 36def3615d01..6384f6c693ff 100644 --- a/drivers/staging/lustre/include/linux/libcfs/libcfs_prim.h +++ b/drivers/staging/lustre/include/linux/libcfs/libcfs_prim.h @@ -56,13 +56,13 @@ int64_t waitq_timedwait(wait_queue_t *, cfs_task_state_t, int64_t); void waitq_wait(wait_queue_t *, cfs_task_state_t); void add_wait_queue_exclusive_head(wait_queue_head_t *, wait_queue_t *); -void cfs_init_timer(timer_list_t *t); -void cfs_timer_init(timer_list_t *t, cfs_timer_func_t *func, void *arg); -void cfs_timer_done(timer_list_t *t); -void cfs_timer_arm(timer_list_t *t, cfs_time_t deadline); -void cfs_timer_disarm(timer_list_t *t); -int cfs_timer_is_armed(timer_list_t *t); -cfs_time_t cfs_timer_deadline(timer_list_t *t); +void cfs_init_timer(struct timer_list *t); +void cfs_timer_init(struct timer_list *t, cfs_timer_func_t *func, void *arg); +void cfs_timer_done(struct timer_list *t); +void cfs_timer_arm(struct timer_list *t, cfs_time_t deadline); +void cfs_timer_disarm(struct timer_list *t); +int cfs_timer_is_armed(struct timer_list *t); +cfs_time_t cfs_timer_deadline(struct timer_list *t); /* * Memory diff --git a/drivers/staging/lustre/include/linux/libcfs/linux/linux-prim.h b/drivers/staging/lustre/include/linux/libcfs/linux/linux-prim.h index acf338b3eb36..f0184e6eb188 100644 --- a/drivers/staging/lustre/include/linux/libcfs/linux/linux-prim.h +++ b/drivers/staging/lustre/include/linux/libcfs/linux/linux-prim.h @@ -107,9 +107,4 @@ typedef struct task_struct task_t; current->journal_info = journal_info; \ } while(0) -/* - * Timer - */ -typedef struct timer_list timer_list_t; - #endif diff --git a/drivers/staging/lustre/lustre/include/lustre_net.h b/drivers/staging/lustre/lustre/include/lustre_net.h index f315ef775256..ce41bf9cc465 100644 --- a/drivers/staging/lustre/lustre/include/lustre_net.h +++ b/drivers/staging/lustre/lustre/include/lustre_net.h @@ -2636,7 +2636,7 @@ struct ptlrpc_service_part { /** reqs waiting for replies */ struct ptlrpc_at_array scp_at_array; /** early reply timer */ - timer_list_t scp_at_timer; + struct timer_list scp_at_timer; /** debug */ cfs_time_t scp_at_checktime; /** check early replies */ diff --git a/drivers/staging/lustre/lustre/include/obd.h b/drivers/staging/lustre/lustre/include/obd.h index 83b0b3287f1e..5cf687f1557b 100644 --- a/drivers/staging/lustre/lustre/include/obd.h +++ b/drivers/staging/lustre/lustre/include/obd.h @@ -900,7 +900,7 @@ struct obd_device { int obd_requests_queued_for_recovery; wait_queue_head_t obd_next_transno_waitq; /* protected by obd_recovery_task_lock */ - timer_list_t obd_recovery_timer; + struct timer_list obd_recovery_timer; time_t obd_recovery_start; /* seconds */ time_t obd_recovery_end; /* seconds, for lprocfs_status */ int obd_recovery_time_hard; diff --git a/drivers/staging/lustre/lustre/libcfs/linux/linux-prim.c b/drivers/staging/lustre/lustre/libcfs/linux/linux-prim.c index b652a79a4811..02e4466287a5 100644 --- a/drivers/staging/lustre/lustre/libcfs/linux/linux-prim.c +++ b/drivers/staging/lustre/lustre/libcfs/linux/linux-prim.c @@ -112,13 +112,13 @@ cfs_pause(cfs_duration_t ticks) } EXPORT_SYMBOL(cfs_pause); -void cfs_init_timer(timer_list_t *t) +void cfs_init_timer(struct timer_list *t) { init_timer(t); } EXPORT_SYMBOL(cfs_init_timer); -void cfs_timer_init(timer_list_t *t, cfs_timer_func_t *func, void *arg) +void cfs_timer_init(struct timer_list *t, cfs_timer_func_t *func, void *arg) { init_timer(t); t->function = func; @@ -126,31 +126,31 @@ void cfs_timer_init(timer_list_t *t, cfs_timer_func_t *func, void *arg) } EXPORT_SYMBOL(cfs_timer_init); -void cfs_timer_done(timer_list_t *t) +void cfs_timer_done(struct timer_list *t) { return; } EXPORT_SYMBOL(cfs_timer_done); -void cfs_timer_arm(timer_list_t *t, cfs_time_t deadline) +void cfs_timer_arm(struct timer_list *t, cfs_time_t deadline) { mod_timer(t, deadline); } EXPORT_SYMBOL(cfs_timer_arm); -void cfs_timer_disarm(timer_list_t *t) +void cfs_timer_disarm(struct timer_list *t) { del_timer(t); } EXPORT_SYMBOL(cfs_timer_disarm); -int cfs_timer_is_armed(timer_list_t *t) +int cfs_timer_is_armed(struct timer_list *t) { return timer_pending(t); } EXPORT_SYMBOL(cfs_timer_is_armed); -cfs_time_t cfs_timer_deadline(timer_list_t *t) +cfs_time_t cfs_timer_deadline(struct timer_list *t) { return t->expires; } diff --git a/drivers/staging/lustre/lustre/llite/llite_internal.h b/drivers/staging/lustre/lustre/llite/llite_internal.h index 28aed684364f..47e443d90fe1 100644 --- a/drivers/staging/lustre/lustre/llite/llite_internal.h +++ b/drivers/staging/lustre/lustre/llite/llite_internal.h @@ -1122,7 +1122,7 @@ int ll_update_remote_perm(struct inode *inode, struct mdt_remote_perm *perm); int lustre_check_remote_perm(struct inode *inode, int mask); /* llite/llite_capa.c */ -extern timer_list_t ll_capa_timer; +extern struct timer_list ll_capa_timer; int ll_capa_thread_start(void); void ll_capa_thread_stop(void); |