diff options
| author |   Peng Tao <bergwolf@gmail.com> | 2014-03-18 21:05:56 +0800 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-03-19 13:42:38 -0700 |
| commit | d3caf4d58bff2ea2826b99fefc0445bb8acd0356 (patch) | |
| tree | a3168e7dfcb8cd53becd0dd45163d259913d3e32 /drivers/staging/lustre/lnet/selftest | |
| parent | staging/lustre/libcfs: remove schedule_timeout_and_set_state (diff) | |
| download | linux-dev-d3caf4d58bff2ea2826b99fefc0445bb8acd0356.tar.xz linux-dev-d3caf4d58bff2ea2826b99fefc0445bb8acd0356.zip | |
staging/lustre/libcfs: remove cfs_pause
Cc: Andreas Dilger <andreas.dilger@intel.com>
Cc: Oleg Drokin <oleg.drokin@intel.com>
Signed-off-by: Peng Tao <bergwolf@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/lustre/lnet/selftest')
| -rw-r--r-- | drivers/staging/lustre/lnet/selftest/conrpc.c | 3 | ||||
| -rw-r--r-- | drivers/staging/lustre/lnet/selftest/rpc.c | 3 | ||||
| -rw-r--r-- | drivers/staging/lustre/lnet/selftest/selftest.h | 6 |
3 files changed, 9 insertions, 3 deletions
diff --git a/drivers/staging/lustre/lnet/selftest/conrpc.c b/drivers/staging/lustre/lnet/selftest/conrpc.c index 53d58924737b..8d1eea4cef6f 100644 --- a/drivers/staging/lustre/lnet/selftest/conrpc.c +++ b/drivers/staging/lustre/lnet/selftest/conrpc.c @@ -1346,7 +1346,8 @@ lstcon_rpc_cleanup_wait(void) mutex_unlock(&console_session.ses_mutex); CWARN("Session is shutting down, waiting for termination of transactions\n"); - cfs_pause(cfs_time_seconds(1)); + set_current_state(TASK_UNINTERRUPTIBLE); + schedule_timeout(cfs_time_seconds(1)); mutex_lock(&console_session.ses_mutex); } diff --git a/drivers/staging/lustre/lnet/selftest/rpc.c b/drivers/staging/lustre/lnet/selftest/rpc.c index d838985f51cb..9fc0429e8296 100644 --- a/drivers/staging/lustre/lnet/selftest/rpc.c +++ b/drivers/staging/lustre/lnet/selftest/rpc.c @@ -1585,7 +1585,8 @@ srpc_startup (void) spin_lock_init(&srpc_data.rpc_glock); /* 1 second pause to avoid timestamp reuse */ - cfs_pause(cfs_time_seconds(1)); + set_current_state(TASK_UNINTERRUPTIBLE); + schedule_timeout(cfs_time_seconds(1)); srpc_data.rpc_matchbits = ((__u64) cfs_time_current_sec()) << 48; srpc_data.rpc_state = SRPC_STATE_NONE; diff --git a/drivers/staging/lustre/lnet/selftest/selftest.h b/drivers/staging/lustre/lnet/selftest/selftest.h index 228927e0f962..f4806a6bc942 100644 --- a/drivers/staging/lustre/lnet/selftest/selftest.h +++ b/drivers/staging/lustre/lnet/selftest/selftest.h @@ -572,7 +572,11 @@ swi_state2str (int state) #undef STATE2STR } -#define selftest_wait_events() cfs_pause(cfs_time_seconds(1) / 10) +#define selftest_wait_events() \ + do { \ + set_current_state(TASK_UNINTERRUPTIBLE); \ + schedule_timeout(cfs_time_seconds(1) / 10); \ + } while (0) #define lst_wait_until(cond, lock, fmt, ...) \ |