summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorChuck Lever <chuck.lever@oracle.com>2010-12-24 02:33:04 +0100
committerTrond Myklebust <Trond.Myklebust@netapp.com>2011-01-06 20:57:46 +0100
commitd3978bb325510f0a26ebd92f211b36c5f98b2306 (patch)
tree5d376fef966d242cb61df1bcfaefeec1e71663d4 /include
parentNFS: Introduce nfs_detach_delegations() (diff)
downloadlinux-d3978bb325510f0a26ebd92f211b36c5f98b2306.tar.xz
linux-d3978bb325510f0a26ebd92f211b36c5f98b2306.zip
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')
-rw-r--r--include/linux/nfs_fs_sb.h2
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 {
u64 cl_clientid; /* constant */
unsigned long cl_state;
- struct list_head cl_delegations;
spinlock_t cl_lock;
unsigned long cl_lease_time;
@@ -152,6 +151,7 @@ struct nfs_server {
struct rb_root openowner_id;
struct rb_root lockowner_id;
#endif
+ struct list_head delegations;
void (*destroy)(struct nfs_server *);
atomic_t active; /* Keep trace of any activity to this server */