aboutsummaryrefslogtreecommitdiffstats
path: root/fs/nfs/client.c
diff options
context:
space:
mode:
authorChuck Lever <chuck.lever@oracle.com>2010-12-23 20:33:04 -0500
committerTrond Myklebust <Trond.Myklebust@netapp.com>2011-01-06 14:57:46 -0500
commitd3978bb325510f0a26ebd92f211b36c5f98b2306 (patch)
tree5d376fef966d242cb61df1bcfaefeec1e71663d4 /fs/nfs/client.c
parentdda4b225623f316335052828c24a16e2da313f8f (diff)
NFS: Move cl_delegations to the nfs_server struct
Delegations are per-inode, not per-nfs_client. When a server file system is migrated, delegations on the client must be moved from the source to the destination nfs_server. Make it easier to manage a mount point's delegation list across a migration event by moving the list to the nfs_server struct. Clean up: I added documenting comments to public functions I changed in this patch. For consistency I added comments to all the other public functions in fs/nfs/delegation.c. Signed-off-by: Chuck Lever <chuck.lever@oracle.com> Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/nfs/client.c')
-rw-r--r--fs/nfs/client.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfs/client.c b/fs/nfs/client.c
index 32b5fbfab35e..192f2f860265 100644
--- a/fs/nfs/client.c
+++ b/fs/nfs/client.c
@@ -172,7 +172,6 @@ static struct nfs_client *nfs_alloc_client(const struct nfs_client_initdata *cl_
172 if (err) 172 if (err)
173 goto error_cleanup; 173 goto error_cleanup;
174 174
175 INIT_LIST_HEAD(&clp->cl_delegations);
176 spin_lock_init(&clp->cl_lock); 175 spin_lock_init(&clp->cl_lock);
177 INIT_DELAYED_WORK(&clp->cl_renewd, nfs4_renew_state); 176 INIT_DELAYED_WORK(&clp->cl_renewd, nfs4_renew_state);
178 rpc_init_wait_queue(&clp->cl_rpcwaitq, "NFS client"); 177 rpc_init_wait_queue(&clp->cl_rpcwaitq, "NFS client");
@@ -1040,6 +1039,7 @@ static struct nfs_server *nfs_alloc_server(void)
1040 /* Zero out the NFS state stuff */ 1039 /* Zero out the NFS state stuff */
1041 INIT_LIST_HEAD(&server->client_link); 1040 INIT_LIST_HEAD(&server->client_link);
1042 INIT_LIST_HEAD(&server->master_link); 1041 INIT_LIST_HEAD(&server->master_link);
1042 INIT_LIST_HEAD(&server->delegations);
1043 1043
1044 atomic_set(&server->active, 0); 1044 atomic_set(&server->active, 0);
1045 1045