Replace deprecated interruptible_sleep_on_timeout() with direct
wait-queue usage. Patch is compile-tested.
Signed-off-by: Nishanth Aravamudan <[EMAIL PROTECTED]>
Signed-off-by: Domen Puncer <[EMAIL PROTECTED]>
---
kj-domen/fs/lockd/svc.c | 6 +++++-
1 files changed, 5 insertions(+), 1 deletion(-)
diff -puN fs/lockd/svc.c~int_sleep_on-fs_lockd_svc fs/lockd/svc.c
--- kj/fs/lockd/svc.c~int_sleep_on-fs_lockd_svc 2005-03-05 16:12:13.000000000
+0100
+++ kj-domen/fs/lockd/svc.c 2005-03-05 16:12:13.000000000 +0100
@@ -25,6 +25,7 @@
#include <linux/slab.h>
#include <linux/smp.h>
#include <linux/smp_lock.h>
+#include <linux/wait.h>
#include <linux/sunrpc/types.h>
#include <linux/sunrpc/stats.h>
@@ -281,6 +282,7 @@ EXPORT_SYMBOL(lockd_up);
void
lockd_down(void)
{
+ DEFINE_WAIT(wait);
static int warned;
down(&nlmsvc_sema);
@@ -303,7 +305,9 @@ lockd_down(void)
* the lockd semaphore, we can't wait around forever ...
*/
clear_thread_flag(TIF_SIGPENDING);
- interruptible_sleep_on_timeout(&lockd_exit, HZ);
+ prepare_to_wait(&lockd_exit, &wait, TASK_INTERRUPTIBLE);
+ schedule_timeout(HZ);
+ finish_wait(&lockd_exit, &wait);
if (nlmsvc_pid) {
printk(KERN_WARNING
"lockd_down: lockd failed to exit, clearing pid\n");
_
-
To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
