aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/lustre/lustre/include/linux/obd.h
diff options
context:
space:
mode:
authorPeng Tao <bergwolf@gmail.com>2014-03-18 21:05:56 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-03-19 13:42:38 -0700
commitd3caf4d58bff2ea2826b99fefc0445bb8acd0356 (patch)
treea3168e7dfcb8cd53becd0dd45163d259913d3e32 /drivers/staging/lustre/lustre/include/linux/obd.h
parentstaging/lustre/libcfs: remove schedule_timeout_and_set_state (diff)
downloadlinux-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/lustre/include/linux/obd.h')
-rw-r--r--drivers/staging/lustre/lustre/include/linux/obd.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/staging/lustre/lustre/include/linux/obd.h b/drivers/staging/lustre/lustre/include/linux/obd.h
index 01a50265239d..dc36f75eb635 100644
--- a/drivers/staging/lustre/lustre/include/linux/obd.h
+++ b/drivers/staging/lustre/lustre/include/linux/obd.h
@@ -96,7 +96,8 @@ static inline void __client_obd_list_lock(client_obd_lock_t *lock,
LCONSOLE_WARN("====== for current process =====\n");
dump_stack();
LCONSOLE_WARN("====== end =======\n");
- cfs_pause(1000 * HZ);
+ set_current_state(TASK_UNINTERRUPTIBLE);
+ schedule_timeout(1000 * HZ);
}
cpu_relax();
}