Gitweb: http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=21051ba6259c519e20a7d575ddceb16e84ad2a5d Commit: 21051ba6259c519e20a7d575ddceb16e84ad2a5d Parent: faa8b6c3c2e1454175609167a25ae525d075f045 Author: Trond Myklebust <[EMAIL PROTECTED]> AuthorDate: Mon May 14 16:50:44 2007 -0400 Committer: Trond Myklebust <[EMAIL PROTECTED]> CommitDate: Mon May 14 19:33:44 2007 -0400
NLM: Fix locking client timeouts... nlmsvc_timeout is already in units of HZ... Signed-off-by: Trond Myklebust <[EMAIL PROTECTED]> --- fs/lockd/host.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/fs/lockd/host.c b/fs/lockd/host.c index ad21c07..96070bf 100644 --- a/fs/lockd/host.c +++ b/fs/lockd/host.c @@ -221,7 +221,7 @@ nlm_bind_host(struct nlm_host *host) host->h_nextrebind - jiffies); } } else { - unsigned long increment = nlmsvc_timeout * HZ; + unsigned long increment = nlmsvc_timeout; struct rpc_timeout timeparms = { .to_initval = increment, .to_increment = increment, - To unsubscribe from this list: send the line "unsubscribe git-commits-head" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html