diff options
| author | Weston Andros Adamson <dros@netapp.com> | 2011-06-01 16:44:44 -0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2011-07-12 13:40:27 -0400 |
| commit | 6382a44138e7aa40bf52170e7afc014443a24806 (patch) | |
| tree | 9126d01d1fe2442fea057c3f45e4e3e532c85424 /fs/nfs/client.c | |
| parent | 35dbbc99e93e57680837c17f96efe370f0535064 (diff) | |
| download | op-kernel-dev-6382a44138e7aa40bf52170e7afc014443a24806.zip op-kernel-dev-6382a44138e7aa40bf52170e7afc014443a24806.tar.gz | |
NFS: move pnfs layouts to nfs_server structure
Layouts should be tracked per nfs_server (aka superblock)
instead of per struct nfs_client, which may have multiple FSIDs associated
with it.
Signed-off-by: Weston Andros Adamson <dros@netapp.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/nfs/client.c')
| -rw-r--r-- | fs/nfs/client.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/fs/nfs/client.c b/fs/nfs/client.c index 006f8ff..5452ada 100644 --- a/fs/nfs/client.c +++ b/fs/nfs/client.c @@ -188,9 +188,6 @@ static struct nfs_client *nfs_alloc_client(const struct nfs_client_initdata *cl_ cred = rpc_lookup_machine_cred(); if (!IS_ERR(cred)) clp->cl_machine_cred = cred; -#if defined(CONFIG_NFS_V4_1) - INIT_LIST_HEAD(&clp->cl_layouts); -#endif nfs_fscache_get_client_cookie(clp); return clp; @@ -1063,6 +1060,7 @@ static struct nfs_server *nfs_alloc_server(void) INIT_LIST_HEAD(&server->client_link); INIT_LIST_HEAD(&server->master_link); INIT_LIST_HEAD(&server->delegations); + INIT_LIST_HEAD(&server->layouts); atomic_set(&server->active, 0); |
