From mboxrd@z Thu Jan  1 00:00:00 1970
From: Mikael Davranche <mikael.davranche@free.fr>
Subject: [PATCH 1/3] NLM: Proposal for a timeout setting on blocking locks
Date: Tue, 11 Mar 2008 13:15:40 +0100
Message-ID: <1205237740.47d677ec65c2d@imp.free.fr>
References: <1205237665.47d677a143941@imp.free.fr>
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7BIT
To: Trond Myklebust <Trond.Myklebust@netapp.com>,
	Trond Myklebust <trond.myklebust@fys.uio.no>,
	linux-fsdevel <linux-fsdevel@vger.kernel.org>
Return-path: <linux-fsdevel-owner@vger.kernel.org>
Received: from postfix1-g20.free.fr ([212.27.60.42]:49566 "EHLO
	postfix1-g20.free.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1753062AbYCKMRq (ORCPT
	<rfc822;linux-fsdevel@vger.kernel.org>);
	Tue, 11 Mar 2008 08:17:46 -0400
Received: from smtp6-g19.free.fr (smtp6-g19.free.fr [212.27.42.36])
	by postfix1-g20.free.fr (Postfix) with ESMTP id 4C20323C5162
	for <linux-fsdevel@vger.kernel.org>; Tue, 11 Mar 2008 13:17:45 +0100 (CET)
In-Reply-To: <1205237665.47d677a143941@imp.free.fr>
Sender: linux-fsdevel-owner@vger.kernel.org
List-ID: <linux-fsdevel.vger.kernel.org>

# diff -u a/include/linux/lockd/lockd.h b/include/linux/lockd/lockd.h
--- a/include/linux/lockd/lockd.h       Tue Feb 26 01:20:20 2008
+++ b/include/linux/lockd/lockd.h       Fri Mar  7 10:33:39 2008
@@ -34,6 +34,11 @@
 #define LOCKD_DFLT_TIMEO       10

 /*
+ * Default timeout for waiting on an NLM blocking lock (seconds)
+ */
+#define NLMCLNT_POLL_TIMEOUT   30
+
+/*
  * Lockd host handle (used both by the client and server personality).
  */
 struct nlm_host {
@@ -154,6 +159,7 @@
 extern int                     nlmsvc_grace_period;
 extern unsigned long           nlmsvc_timeout;
 extern int                     nsm_use_hostnames;
+extern unsigned long           nlm_clnt_poll_timeout;

 /*
  * Lockd client functions