From: J. Bruce Fields <bfields@citi.umich.edu>
Date: Tue, 20 Nov 2007 01:31:04 +0000 (-0500)
Subject: nfsd: uniquify cl_confirm values
X-Git-Tag: v2.6.25-rc1~1072^2~72
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=deda2faa8e71474c828d8eefc8bc0f19d02062ef;p=linux-2.6

nfsd: uniquify cl_confirm values

Using a counter instead of the nanoseconds value seems more likely to
produce a unique cl_confirm.

Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
---

diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
index 035e70a010..9f6322e830 100644
--- a/fs/nfsd/nfs4state.c
+++ b/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