diff options
author | Chuck Lever <chuck.lever@oracle.com> | 2010-12-23 20:33:04 -0500 |
---|---|---|
committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2011-01-06 14:57:46 -0500 |
commit | d3978bb325510f0a26ebd92f211b36c5f98b2306 (patch) | |
tree | 5d376fef966d242cb61df1bcfaefeec1e71663d4 /include/linux/nfs_fs_sb.h | |
parent | dda4b225623f316335052828c24a16e2da313f8f (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 'include/linux/nfs_fs_sb.h')
-rw-r--r-- | include/linux/nfs_fs_sb.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/nfs_fs_sb.h b/include/linux/nfs_fs_sb.h index 27255ffdbe10..b197563913bf 100644 --- a/include/linux/nfs_fs_sb.h +++ b/include/linux/nfs_fs_sb.h | |||
@@ -47,7 +47,6 @@ struct nfs_client { | |||
47 | u64 cl_clientid; /* constant */ | 47 | u64 cl_clientid; /* constant */ |
48 | unsigned long cl_state; | 48 | unsigned long cl_state; |
49 | 49 | ||
50 | struct list_head cl_delegations; | ||
51 | spinlock_t cl_lock; | 50 | spinlock_t cl_lock; |
52 | 51 | ||
53 | unsigned long cl_lease_time; | 52 | unsigned long cl_lease_time; |
@@ -152,6 +151,7 @@ struct nfs_server { | |||
152 | struct rb_root openowner_id; | 151 | struct rb_root openowner_id; |
153 | struct rb_root lockowner_id; | 152 | struct rb_root lockowner_id; |
154 | #endif | 153 | #endif |
154 | struct list_head delegations; | ||
155 | void (*destroy)(struct nfs_server *); | 155 | void (*destroy)(struct nfs_server *); |
156 | 156 | ||
157 | atomic_t active; /* Keep trace of any activity to this server */ | 157 | atomic_t active; /* Keep trace of any activity to this server */ |