From mboxrd@z Thu Jan 1 00:00:00 1970 From: domen@coderock.org Subject: [patch 5/7] lockd/svc: remove interruptible_sleep_on_timeout() usage Date: Mon, 20 Jun 2005 23:57:04 +0200 Message-ID: <20050620215703.797702000@nd47.coderock.org> Cc: linux-fsdevel@vger.kernel.org, Nishanth Aravamudan , domen@coderock.org Return-path: Received: from coderock.org ([193.77.147.115]:22427 "EHLO trashy.coderock.org") by vger.kernel.org with ESMTP id S262247AbVFTWFD (ORCPT ); Mon, 20 Jun 2005 18:05:03 -0400 To: viro@parcelfarce.linux.theplanet.co.uk Content-Disposition: inline; filename=int_sleep_on-fs_lockd_svc.patch Sender: linux-fsdevel-owner@vger.kernel.org List-Id: linux-fsdevel.vger.kernel.org From: Nishanth Aravamudan Replace deprecated interruptible_sleep_on_timeout() with direct wait-queue usage. Patch is compile-tested. Signed-off-by: Nishanth Aravamudan Signed-off-by: Domen Puncer --- svc.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletion(-) Index: quilt/fs/lockd/svc.c =================================================================== --- quilt.orig/fs/lockd/svc.c +++ quilt/fs/lockd/svc.c @@ -25,6 +25,7 @@ #include #include #include +#include #include #include @@ -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"); --