---

yaml --- r: 229242 b: refs/heads/master c: d3978bb h: refs/heads/master v: v3
git-mirror · Jan 6, 2011 · 3e8238e · 3e8238e
1 parent bfc3000
commit 3e8238e
Show file tree

Hide file tree

Showing 6 changed files with 252 additions and 94 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dda4b225623f316335052828c24a16e2da313f8f
+refs/heads/master: d3978bb325510f0a26ebd92f211b36c5f98b2306
diff --git a/trunk/fs/nfs/client.c b/trunk/fs/nfs/client.c
@@ -172,7 +172,6 @@ static struct nfs_client *nfs_alloc_client(const struct nfs_client_initdata *cl_
 	if (err)
 		goto error_cleanup;
 
-	INIT_LIST_HEAD(&clp->cl_delegations);
 	spin_lock_init(&clp->cl_lock);
 	INIT_DELAYED_WORK(&clp->cl_renewd, nfs4_renew_state);
 	rpc_init_wait_queue(&clp->cl_rpcwaitq, "NFS client");
@@ -1040,6 +1039,7 @@ static struct nfs_server *nfs_alloc_server(void)
 	/* Zero out the NFS state stuff */
 	INIT_LIST_HEAD(&server->client_link);
 	INIT_LIST_HEAD(&server->master_link);
+	INIT_LIST_HEAD(&server->delegations);
 
 	atomic_set(&server->active, 0);