From 0e6b0e38323f87d1a5d1658eb407b14a6136654c Mon Sep 17 00:00:00 2001
From: "J. Bruce Fields" <bfields@redhat.com>
Date: Fri, 6 Aug 2010 15:48:03 -0400
Subject: [PATCH] --- yaml --- r: 206453 b: refs/heads/master c:
 e844a7b9805a2b74cfd34c8604f5bba3e0869305 h: refs/heads/master i:   206451:
 ba4b41cd18e4700731003feadd5e2e7b42243787 v: v3

---
 [refs]                 | 2 +-
 trunk/fs/nfsd/nfssvc.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 47279efd1140..f470519debec 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e2aa7f8304b3b5656ded8699216cc65138d03b64
+refs/heads/master: e844a7b9805a2b74cfd34c8604f5bba3e0869305
diff --git a/trunk/fs/nfsd/nfssvc.c b/trunk/fs/nfsd/nfssvc.c
index 39ced4a52c5f..e2c43464f237 100644
--- a/trunk/fs/nfsd/nfssvc.c
+++ b/trunk/fs/nfsd/nfssvc.c
@@ -224,7 +224,6 @@ static int nfsd_startup(unsigned short port, int nrservs)
 	ret = nfs4_state_start();
 	if (ret)
 		goto out_lockd;
-	nfsd_reset_versions();
 	nfsd_up = true;
 	return 0;
 out_lockd:
@@ -329,6 +328,7 @@ int nfsd_create_serv(void)
 		       nfsd_max_blksize >= 8*1024*2)
 			nfsd_max_blksize /= 2;
 	}
+	nfsd_reset_versions();
 
 	nfsd_serv = svc_create_pooled(&nfsd_program, nfsd_max_blksize,
 				      nfsd_last_thread, nfsd, THIS_MODULE);