From mboxrd@z Thu Jan 1 00:00:00 1970 From: Nishanth Aravamudan Subject: [PATCH] fs/clntlock: remove sleep_on*() usage Date: Wed, 26 Jan 2005 11:40:57 -0800 Message-ID: <20050126194057.GE3593@us.ibm.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: linux-fsdevel@vger.kernel.org, kernel-janitors@lists.osdl.org Return-path: Received: from e33.co.us.ibm.com ([32.97.110.131]:17643 "EHLO e33.co.us.ibm.com") by vger.kernel.org with ESMTP id S262179AbVAZTlE (ORCPT ); Wed, 26 Jan 2005 14:41:04 -0500 Received: from westrelay02.boulder.ibm.com (westrelay02.boulder.ibm.com [9.17.195.11]) by e33.co.us.ibm.com (8.12.10/8.12.9) with ESMTP id j0QJexCO438924 for ; Wed, 26 Jan 2005 14:40:59 -0500 Received: from d03av02.boulder.ibm.com (d03av02.boulder.ibm.com [9.17.195.168]) by westrelay02.boulder.ibm.com (8.12.10/NCO/VER6.6) with ESMTP id j0QJextB440020 for ; Wed, 26 Jan 2005 12:40:59 -0700 Received: from d03av02.boulder.ibm.com (loopback [127.0.0.1]) by d03av02.boulder.ibm.com (8.12.11/8.12.11) with ESMTP id j0QJewYl002322 for ; Wed, 26 Jan 2005 12:40:58 -0700 To: okir@monad.swb.de, matthew@wil.cx Content-Disposition: inline Sender: linux-fsdevel-owner@vger.kernel.org List-Id: linux-fsdevel.vger.kernel.org Hi, Please consider applying. Description: 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 --- 2.6.11-rc2-kj-v/fs/lockd/clntlock.c 2005-01-24 09:28:16.000000000 -0800 +++ 2.6.11-rc2-kj/fs/lockd/clntlock.c 2005-01-26 10:45:52.000000000 -0800 @@ -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) {