# 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 -- To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html