From e156cc7a425d7884efff7da8cb75476b030b23cf Mon Sep 17 00:00:00 2001 From: "J. Bruce Fields" Date: Mon, 19 Nov 2007 20:31:04 -0500 Subject: [PATCH] --- yaml --- r: 82429 b: refs/heads/master c: deda2faa8e71474c828d8eefc8bc0f19d02062ef h: refs/heads/master i: 82427: 6b81eb20a367c454f8539a4874096677e45dc000 v: v3 --- [refs] | 2 +- trunk/fs/nfsd/nfs4state.c | 13 ++++++------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 16f7464e2aeb..b6dd5c8f1d00 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 49ba87811f34a0219dc7a373cd24aa68450f2058 +refs/heads/master: deda2faa8e71474c828d8eefc8bc0f19d02062ef diff --git a/trunk/fs/nfsd/nfs4state.c b/trunk/fs/nfsd/nfs4state.c index 035e70a01027..9f6322e830fa 100644 --- a/trunk/fs/nfsd/nfs4state.c +++ b/trunk/fs/nfsd/nfs4state.c @@ -491,15 +491,14 @@ gen_clid(struct nfs4_client *clp) { clp->cl_clientid.cl_id = current_clientid++; } -static void -gen_confirm(struct nfs4_client *clp) { - struct timespec tv; - u32 * p; +static void gen_confirm(struct nfs4_client *clp) +{ + static u32 i; + u32 *p; - tv = CURRENT_TIME; p = (u32 *)clp->cl_confirm.data; - *p++ = tv.tv_sec; - *p++ = tv.tv_nsec; + *p++ = get_seconds(); + *p++ = i++; } static int