staging/lustre/libcfs: remove schedule_timeout_and_set_state

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>

diff --cc drivers/staging/lustre/include/linux/libcfs/libcfs_prim.h
Simple merge

diff --cc drivers/staging/lustre/lnet/lnet/router.c
Simple merge

diff --cc drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c
Simple merge

diff --cc drivers/staging/lustre/lustre/libcfs/fail.c
Simple merge

diff --cc drivers/staging/lustre/lustre/libcfs/linux/linux-prim.c
Simple merge

diff --cc drivers/staging/lustre/lustre/obdclass/genops.c
Simple merge

diff --cc drivers/staging/lustre/lustre/obdecho/echo.c
Simple merge

diff --cc drivers/staging/lustre/lustre/obdecho/echo_client.c
Simple merge

diff --cc drivers/staging/lustre/lustre/ptlrpc/sec.c
Simple merge