diff options
| author | Chuck Lever <chuck.lever@oracle.com> | 2010-12-24 01:32:43 +0000 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2011-01-06 14:47:57 -0500 |
| commit | 24d292b894273495f9664bb495e575f8cb7e8cac (patch) | |
| tree | 5d2815f1e26c9616daa63cb117a6b28dff6266be /fs/nfs/nfs4_fs.h | |
| parent | fca5238ef3232cd0cf4bf0457e751b3bb20912a9 (diff) | |
| download | linux-0-day-24d292b894273495f9664bb495e575f8cb7e8cac.tar.gz linux-0-day-24d292b894273495f9664bb495e575f8cb7e8cac.tar.xz | |
NFS: Move cl_state_owners and related fields to the nfs_server struct
NFSv4 migration needs to reassociate state owners from the source to
the destination nfs_server data structures. To make that easier, move
the cl_state_owners field to the nfs_server struct. cl_openowner_id
and cl_lockowner_id accompany this move, as they are used in
conjunction with cl_state_owners.
The cl_lock field in the parent nfs_client continues to protect all
three of these fields.
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/nfs/nfs4_fs.h')
| -rw-r--r-- | fs/nfs/nfs4_fs.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfs/nfs4_fs.h b/fs/nfs/nfs4_fs.h index 18d64cb5985bd..7a74740731488 100644 --- a/fs/nfs/nfs4_fs.h +++ b/fs/nfs/nfs4_fs.h @@ -110,7 +110,7 @@ struct nfs_unique_id { struct nfs4_state_owner { struct nfs_unique_id so_owner_id; struct nfs_server *so_server; - struct rb_node so_client_node; + struct rb_node so_server_node; struct rpc_cred *so_cred; /* Associated cred */ |