diff options
author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2008-12-23 15:21:43 -0500 |
---|---|---|
committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2008-12-23 15:21:43 -0500 |
commit | 7eff03aec917e17f733471d7e12c262c0c96409f (patch) | |
tree | 6f0e7b53cbf55689cd37cfe3b1b087b8c61ac4cd /fs/nfs/nfs4_fs.h | |
parent | 0f605b56008c4b6b075217480c36ba395ca4eaa4 (diff) |
NFSv4: Add a recovery marking scheme for state owners
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/nfs/nfs4_fs.h')
-rw-r--r-- | fs/nfs/nfs4_fs.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/fs/nfs/nfs4_fs.h b/fs/nfs/nfs4_fs.h index 76eda46b5a17..a4e7b3feef8f 100644 --- a/fs/nfs/nfs4_fs.h +++ b/fs/nfs/nfs4_fs.h | |||
@@ -94,12 +94,18 @@ struct nfs4_state_owner { | |||
94 | 94 | ||
95 | spinlock_t so_lock; | 95 | spinlock_t so_lock; |
96 | atomic_t so_count; | 96 | atomic_t so_count; |
97 | unsigned long so_flags; | ||
97 | struct list_head so_states; | 98 | struct list_head so_states; |
98 | struct list_head so_delegations; | 99 | struct list_head so_delegations; |
99 | struct nfs_seqid_counter so_seqid; | 100 | struct nfs_seqid_counter so_seqid; |
100 | struct rpc_sequence so_sequence; | 101 | struct rpc_sequence so_sequence; |
101 | }; | 102 | }; |
102 | 103 | ||
104 | enum { | ||
105 | NFS_OWNER_RECLAIM_REBOOT, | ||
106 | NFS_OWNER_RECLAIM_NOGRACE | ||
107 | }; | ||
108 | |||
103 | /* | 109 | /* |
104 | * struct nfs4_state maintains the client-side state for a given | 110 | * struct nfs4_state maintains the client-side state for a given |
105 | * (state_owner,inode) tuple (OPEN) or state_owner (LOCK). | 111 | * (state_owner,inode) tuple (OPEN) or state_owner (LOCK). |
@@ -166,6 +172,7 @@ struct nfs4_exception { | |||
166 | }; | 172 | }; |
167 | 173 | ||
168 | struct nfs4_state_recovery_ops { | 174 | struct nfs4_state_recovery_ops { |
175 | int owner_flag_bit; | ||
169 | int state_flag_bit; | 176 | int state_flag_bit; |
170 | int (*recover_open)(struct nfs4_state_owner *, struct nfs4_state *); | 177 | int (*recover_open)(struct nfs4_state_owner *, struct nfs4_state *); |
171 | int (*recover_lock)(struct nfs4_state *, struct file_lock *); | 178 | int (*recover_lock)(struct nfs4_state *, struct file_lock *); |