aboutsummaryrefslogtreecommitdiff
path: root/fs/nfs/nfs4_fs.h
diff options
context:
space:
mode:
authorTrond Myklebust <Trond.Myklebust@netapp.com>2012-01-17 22:04:25 -0500
committerTrond Myklebust <Trond.Myklebust@netapp.com>2012-01-31 19:28:07 -0500
commit48c22eb21071a3524f8b6e587371be35b5e86969 (patch)
tree68f2bb02f61b59c87f961cf7345aeb73e2662d4b /fs/nfs/nfs4_fs.h
parent7ba127ab9f5f83991df4142d5bc4fc319cd77a54 (diff)
downloadlinux-stericsson-48c22eb21071a3524f8b6e587371be35b5e86969.tar.gz
NFS: Move struct nfs_unique_id into struct nfs_seqid_counter
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/nfs/nfs4_fs.h')
-rw-r--r--fs/nfs/nfs4_fs.h8
1 files changed, 6 insertions, 2 deletions
diff --git a/fs/nfs/nfs4_fs.h b/fs/nfs/nfs4_fs.h
index c4025ae1d071..df3d02c3e8cb 100644
--- a/fs/nfs/nfs4_fs.h
+++ b/fs/nfs/nfs4_fs.h
@@ -53,8 +53,14 @@ struct nfs4_minor_version_ops {
const struct nfs4_state_maintenance_ops *state_renewal_ops;
};
+struct nfs_unique_id {
+ struct rb_node rb_node;
+ __u64 id;
+};
+
#define NFS_SEQID_CONFIRMED 1
struct nfs_seqid_counter {
+ int owner_id;
int flags;
u32 counter;
spinlock_t lock; /* Protects the list */
@@ -91,7 +97,6 @@ struct nfs4_state_owner {
unsigned long so_flags;
struct list_head so_states;
struct nfs_seqid_counter so_seqid;
- int so_owner_id;
};
enum {
@@ -131,7 +136,6 @@ struct nfs4_lock_state {
struct nfs4_state * ls_state; /* Pointer to open state */
#define NFS_LOCK_INITIALIZED 1
int ls_flags;
- int ls_id;
struct nfs_seqid_counter ls_seqid;
nfs4_stateid ls_stateid;
atomic_t ls_count;