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:06 -0500
commit7ba127ab9f5f83991df4142d5bc4fc319cd77a54 (patch)
treea627905cdb6a4be7aa3a8b09df258bc524383524 /fs/nfs/nfs4_fs.h
parent9d12b216aa87f68c96f6dd8eb5d2d0ccc9989b1c (diff)
downloadlinux-stericsson-7ba127ab9f5f83991df4142d5bc4fc319cd77a54.tar.gz
NFSv4: Move contents of struct rpc_sequence into struct nfs_seqid_counter
Clean up. Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/nfs/nfs4_fs.h')
-rw-r--r--fs/nfs/nfs4_fs.h16
1 files changed, 3 insertions, 13 deletions
diff --git a/fs/nfs/nfs4_fs.h b/fs/nfs/nfs4_fs.h
index 0924494e10a2..c4025ae1d071 100644
--- a/fs/nfs/nfs4_fs.h
+++ b/fs/nfs/nfs4_fs.h
@@ -53,21 +53,13 @@ struct nfs4_minor_version_ops {
const struct nfs4_state_maintenance_ops *state_renewal_ops;
};
-/*
- * struct rpc_sequence ensures that RPC calls are sent in the exact
- * order that they appear on the list.
- */
-struct rpc_sequence {
- struct rpc_wait_queue wait; /* RPC call delay queue */
- spinlock_t lock; /* Protects the list */
- struct list_head list; /* Defines sequence of RPC calls */
-};
-
#define NFS_SEQID_CONFIRMED 1
struct nfs_seqid_counter {
- struct rpc_sequence *sequence;
int flags;
u32 counter;
+ spinlock_t lock; /* Protects the list */
+ struct list_head list; /* Defines sequence of RPC calls */
+ struct rpc_wait_queue wait; /* RPC call delay queue */
};
struct nfs_seqid {
@@ -99,7 +91,6 @@ struct nfs4_state_owner {
unsigned long so_flags;
struct list_head so_states;
struct nfs_seqid_counter so_seqid;
- struct rpc_sequence so_sequence;
int so_owner_id;
};
@@ -142,7 +133,6 @@ struct nfs4_lock_state {
int ls_flags;
int ls_id;
struct nfs_seqid_counter ls_seqid;
- struct rpc_sequence ls_sequence;
nfs4_stateid ls_stateid;
atomic_t ls_count;
struct nfs4_lock_owner ls_owner;