diff options
Diffstat (limited to 'drivers/staging/lustre/lustre')
4 files changed, 3 insertions, 14 deletions
diff --git a/drivers/staging/lustre/lustre/include/lustre_lib.h b/drivers/staging/lustre/lustre/include/lustre_lib.h index 06954364db5e..0368ca6ffcc1 100644 --- a/drivers/staging/lustre/lustre/include/lustre_lib.h +++ b/drivers/staging/lustre/lustre/include/lustre_lib.h @@ -564,9 +564,7 @@ do { \ min_t(cfs_duration_t, \ info->lwi_interval,__timeout):\ __timeout; \ - cfs_duration_t remaining = waitq_timedwait(&__wait,\ - __wstate, \ - interval); \ + cfs_duration_t remaining = schedule_timeout(interval);\ __timeout = cfs_time_sub(__timeout, \ cfs_time_sub(interval, remaining));\ if (__timeout == 0) { \ diff --git a/drivers/staging/lustre/lustre/libcfs/linux/linux-prim.c b/drivers/staging/lustre/lustre/libcfs/linux/linux-prim.c index 86475c2b42a7..8aa00e573834 100644 --- a/drivers/staging/lustre/lustre/libcfs/linux/linux-prim.c +++ b/drivers/staging/lustre/lustre/libcfs/linux/linux-prim.c @@ -70,13 +70,6 @@ add_wait_queue_exclusive_head(wait_queue_head_t *waitq, wait_queue_t *link) } EXPORT_SYMBOL(add_wait_queue_exclusive_head); -int64_t -waitq_timedwait(wait_queue_t *link, long state, int64_t timeout) -{ - return schedule_timeout(timeout); -} -EXPORT_SYMBOL(waitq_timedwait); - void schedule_timeout_and_set_state(long state, int64_t timeout) { diff --git a/drivers/staging/lustre/lustre/libcfs/tracefile.c b/drivers/staging/lustre/lustre/libcfs/tracefile.c index 32ed879e66d4..c8599eefeb76 100644 --- a/drivers/staging/lustre/lustre/libcfs/tracefile.c +++ b/drivers/staging/lustre/lustre/libcfs/tracefile.c @@ -1079,8 +1079,7 @@ end_loop: init_waitqueue_entry(&__wait, current); add_wait_queue(&tctl->tctl_waitq, &__wait); set_current_state(TASK_INTERRUPTIBLE); - waitq_timedwait(&__wait, TASK_INTERRUPTIBLE, - cfs_time_seconds(1)); + schedule_timeout(cfs_time_seconds(1)); remove_wait_queue(&tctl->tctl_waitq, &__wait); } complete(&tctl->tctl_stop); diff --git a/drivers/staging/lustre/lustre/libcfs/upcall_cache.c b/drivers/staging/lustre/lustre/libcfs/upcall_cache.c index 8a3b62d08e68..8085e32e5e7a 100644 --- a/drivers/staging/lustre/lustre/libcfs/upcall_cache.c +++ b/drivers/staging/lustre/lustre/libcfs/upcall_cache.c @@ -223,8 +223,7 @@ find_again: set_current_state(TASK_INTERRUPTIBLE); spin_unlock(&cache->uc_lock); - left = waitq_timedwait(&wait, TASK_INTERRUPTIBLE, - expiry); + left = schedule_timeout(expiry); spin_lock(&cache->uc_lock); remove_wait_queue(&entry->ue_waitq, &wait); |