From mboxrd@z Thu Jan 1 00:00:00 1970 From: domen@coderock.org Subject: [patch 7/7] fs/clntlock: remove sleep_on*() usage Date: Sun, 06 Mar 2005 11:37:52 +0100 Message-ID: <20050306103752.BF6FF1F208@trashy.coderock.org> Cc: linux-fsdevel@vger.kernel.org, domen@coderock.org, nacc@us.ibm.com Received: from coderock.org ([193.77.147.115]:3498 "EHLO trashy.coderock.org") by vger.kernel.org with ESMTP id S261382AbVCFKiG (ORCPT ); Sun, 6 Mar 2005 05:38:06 -0500 To: viro@parcelfarce.linux.theplanet.co.uk Sender: linux-fsdevel-owner@vger.kernel.org List-Id: linux-fsdevel.vger.kernel.org Directly use wait-queues instead of the deprecated sleep_on_timeout(). Since the sleep in this function is unconditional, wait_event_timeout() does not appear to be appropriate. Patch is compile-tested. Signed-off-by: Nishanth Aravamudan Signed-off-by: Domen Puncer --- kj-domen/fs/lockd/clntlock.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletion(-) diff -puN fs/lockd/clntlock.c~sleep_on-fs_lockd_clntlock fs/lockd/clntlock.c --- kj/fs/lockd/clntlock.c~sleep_on-fs_lockd_clntlock 2005-03-05 16:13:13.000000000 +0100 +++ kj-domen/fs/lockd/clntlock.c 2005-03-05 16:13:13.000000000 +0100 @@ -14,6 +14,7 @@ #include #include #include +#include #define NLMDBG_FACILITY NLMDBG_CLIENT @@ -47,6 +48,7 @@ static struct nlm_wait * nlm_blocked; int nlmclnt_block(struct nlm_host *host, struct file_lock *fl, u32 *statp) { + DEFINE_WAIT(wait); struct nlm_wait block, **head; int err; u32 pstate; @@ -69,7 +71,9 @@ nlmclnt_block(struct nlm_host *host, str * a 1 minute timeout would do. See the comment before * nlmclnt_lock for an explanation. */ - sleep_on_timeout(&block.b_wait, 30*HZ); + prepare_to_wait(&block.b_wait, &wait, TASK_UNINTERRUPTIBLE); + schedule_timeout(30*HZ); + finish_wait(&block.b_wait, &wait); for (head = &nlm_blocked; *head; head = &(*head)->b_next) { if (*head == &block) { _