aboutsummaryrefslogtreecommitdiffstats
path: root/fs/nfsd/xdr4.h
diff options
context:
space:
mode:
authorJ. Bruce Fields <bfields@redhat.com>2011-08-24 12:45:03 -0400
committerJ. Bruce Fields <bfields@redhat.com>2011-08-31 17:56:03 -0400
commit9072d5c66b17292e3cd055bc8057b2ce6af2fe34 (patch)
tree1a043fb220698cd67f24ab47f7734210449cc65c /fs/nfsd/xdr4.h
parentf3e4223751392b9bc0195a806a6e99b4cc399ac0 (diff)
nfsd4: cleanup seqid op stateowner usage
Now that the replay owner is in the cstate we can remove it from a lot of other individual operations and further simplify nfs4_preprocess_seqid_op(). Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Diffstat (limited to 'fs/nfsd/xdr4.h')
-rw-r--r--fs/nfsd/xdr4.h7
1 files changed, 0 insertions, 7 deletions
diff --git a/fs/nfsd/xdr4.h b/fs/nfsd/xdr4.h
index 663193b21a24..341f0a17d217 100644
--- a/fs/nfsd/xdr4.h
+++ b/fs/nfsd/xdr4.h
@@ -81,7 +81,6 @@ struct nfsd4_access {
81struct nfsd4_close { 81struct nfsd4_close {
82 u32 cl_seqid; /* request */ 82 u32 cl_seqid; /* request */
83 stateid_t cl_stateid; /* request+response */ 83 stateid_t cl_stateid; /* request+response */
84 struct nfs4_stateowner * cl_stateowner; /* response */
85}; 84};
86 85
87struct nfsd4_commit { 86struct nfsd4_commit {
@@ -165,9 +164,6 @@ struct nfsd4_lock {
165 } ok; 164 } ok;
166 struct nfsd4_lock_denied denied; 165 struct nfsd4_lock_denied denied;
167 } u; 166 } u;
168 /* The lk_replay_owner is the open owner in the open_to_lock_owner
169 * case and the lock owner otherwise: */
170 struct nfs4_stateowner *lk_replay_owner;
171}; 167};
172#define lk_new_open_seqid v.new.open_seqid 168#define lk_new_open_seqid v.new.open_seqid
173#define lk_new_open_stateid v.new.open_stateid 169#define lk_new_open_stateid v.new.open_stateid
@@ -199,7 +195,6 @@ struct nfsd4_locku {
199 stateid_t lu_stateid; 195 stateid_t lu_stateid;
200 u64 lu_offset; 196 u64 lu_offset;
201 u64 lu_length; 197 u64 lu_length;
202 struct nfs4_stateowner *lu_stateowner;
203}; 198};
204 199
205 200
@@ -243,7 +238,6 @@ struct nfsd4_open_confirm {
243 stateid_t oc_req_stateid /* request */; 238 stateid_t oc_req_stateid /* request */;
244 u32 oc_seqid /* request */; 239 u32 oc_seqid /* request */;
245 stateid_t oc_resp_stateid /* response */; 240 stateid_t oc_resp_stateid /* response */;
246 struct nfs4_stateowner * oc_stateowner; /* response */
247}; 241};
248 242
249struct nfsd4_open_downgrade { 243struct nfsd4_open_downgrade {
@@ -251,7 +245,6 @@ struct nfsd4_open_downgrade {
251 u32 od_seqid; 245 u32 od_seqid;
252 u32 od_share_access; 246 u32 od_share_access;
253 u32 od_share_deny; 247 u32 od_share_deny;
254 struct nfs4_stateowner *od_stateowner;
255}; 248};
256 249
257 250