From mboxrd@z Thu Jan 1 00:00:00 1970 From: domen@coderock.org Subject: [patch 6/7] lockd/svc: remove interruptible_sleep_on_timeout() usage Date: Sun, 06 Mar 2005 11:37:47 +0100 Message-ID: <20050306103748.F111B1F23D@trashy.coderock.org> Cc: linux-fsdevel@vger.kernel.org, domen@coderock.org, nacc@us.ibm.com Received: from coderock.org ([193.77.147.115]:2474 "EHLO trashy.coderock.org") by vger.kernel.org with ESMTP id S261381AbVCFKiD (ORCPT ); Sun, 6 Mar 2005 05:38:03 -0500 To: viro@parcelfarce.linux.theplanet.co.uk Sender: linux-fsdevel-owner@vger.kernel.org List-Id: linux-fsdevel.vger.kernel.org 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 --- 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 #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"); _