diff options
author | Kinglong Mee <kinglongmee@gmail.com> | 2013-12-04 21:41:40 -0500 |
---|---|---|
committer | J. Bruce Fields <bfields@redhat.com> | 2014-01-06 12:23:32 -0500 |
commit | 3ff69309fed8ac3755864addfa064b51abfcde06 (patch) | |
tree | c190d3bba80848d86d7f460ff4c01c9a76b0dddb | |
parent | ff88825fbb9f5a503164bb5ad4a8c65dabfa13e0 (diff) |
Define op_iattr for nfsd4_open instead using macro
Signed-off-by: Kinglong Mee <kinglongmee@gmail.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
-rw-r--r-- | fs/nfsd/xdr4.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/nfsd/xdr4.h b/fs/nfsd/xdr4.h index 916a40737313..d278a0d03496 100644 --- a/fs/nfsd/xdr4.h +++ b/fs/nfsd/xdr4.h | |||
@@ -228,7 +228,7 @@ struct nfsd4_open { | |||
228 | u32 op_create; /* request */ | 228 | u32 op_create; /* request */ |
229 | u32 op_createmode; /* request */ | 229 | u32 op_createmode; /* request */ |
230 | u32 op_bmval[3]; /* request */ | 230 | u32 op_bmval[3]; /* request */ |
231 | struct iattr iattr; /* UNCHECKED4, GUARDED4, EXCLUSIVE4_1 */ | 231 | struct iattr op_iattr; /* UNCHECKED4, GUARDED4, EXCLUSIVE4_1 */ |
232 | nfs4_verifier op_verf __attribute__((aligned(32))); | 232 | nfs4_verifier op_verf __attribute__((aligned(32))); |
233 | /* EXCLUSIVE4 */ | 233 | /* EXCLUSIVE4 */ |
234 | clientid_t op_clientid; /* request */ | 234 | clientid_t op_clientid; /* request */ |
@@ -250,7 +250,6 @@ struct nfsd4_open { | |||
250 | struct nfs4_acl *op_acl; | 250 | struct nfs4_acl *op_acl; |
251 | struct xdr_netobj op_label; | 251 | struct xdr_netobj op_label; |
252 | }; | 252 | }; |
253 | #define op_iattr iattr | ||
254 | 253 | ||
255 | struct nfsd4_open_confirm { | 254 | struct nfsd4_open_confirm { |
256 | stateid_t oc_req_stateid /* request */; | 255 | stateid_t oc_req_stateid /* request */; |