aboutsummaryrefslogtreecommitdiffstats
path: root/fs/nfs/nfs4_fs.h
diff options
context:
space:
mode:
Diffstat (limited to 'fs/nfs/nfs4_fs.h')
-rw-r--r--fs/nfs/nfs4_fs.h6
1 files changed, 0 insertions, 6 deletions
diff --git a/fs/nfs/nfs4_fs.h b/fs/nfs/nfs4_fs.h
index 6ac6708484f5..d4fcb5d0ce6c 100644
--- a/fs/nfs/nfs4_fs.h
+++ b/fs/nfs/nfs4_fs.h
@@ -125,16 +125,11 @@ static inline void nfs_confirm_seqid(struct nfs_seqid_counter *seqid, int status
125 * NFS4 state_owners and lock_owners are simply labels for ordered 125 * NFS4 state_owners and lock_owners are simply labels for ordered
126 * sequences of RPC calls. Their sole purpose is to provide once-only 126 * sequences of RPC calls. Their sole purpose is to provide once-only
127 * semantics by allowing the server to identify replayed requests. 127 * semantics by allowing the server to identify replayed requests.
128 *
129 * The ->so_sema is held during all state_owner seqid-mutating operations:
130 * OPEN, OPEN_DOWNGRADE, and CLOSE. Its purpose is to properly serialize
131 * so_seqid.
132 */ 128 */
133struct nfs4_state_owner { 129struct nfs4_state_owner {
134 struct list_head so_list; /* per-clientid list of state_owners */ 130 struct list_head so_list; /* per-clientid list of state_owners */
135 struct nfs4_client *so_client; 131 struct nfs4_client *so_client;
136 u32 so_id; /* 32-bit identifier, unique */ 132 u32 so_id; /* 32-bit identifier, unique */
137 struct semaphore so_sema;
138 atomic_t so_count; 133 atomic_t so_count;
139 134
140 struct rpc_cred *so_cred; /* Associated cred */ 135 struct rpc_cred *so_cred; /* Associated cred */
@@ -183,7 +178,6 @@ struct nfs4_state {
183 struct inode *inode; /* Pointer to the inode */ 178 struct inode *inode; /* Pointer to the inode */
184 179
185 unsigned long flags; /* Do we hold any locks? */ 180 unsigned long flags; /* Do we hold any locks? */
186 struct semaphore lock_sema; /* Serializes file locking operations */
187 spinlock_t state_lock; /* Protects the lock_states list */ 181 spinlock_t state_lock; /* Protects the lock_states list */
188 182
189 nfs4_stateid stateid; 183 nfs4_stateid stateid;