diff options
author | Tigran Mkrtchyan <kofemann@gmail.com> | 2012-02-13 16:55:32 -0500 |
---|---|---|
committer | J. Bruce Fields <bfields@redhat.com> | 2012-02-15 11:20:45 -0500 |
commit | 37c593c57324740821766c56e48cf09776a68a9c (patch) | |
tree | 9c6f91acb532da56f5d5f24c2aa8a345f717c81a /fs/nfsd/xdr4.h | |
parent | 9428fe1abb672c67169d3b6abf0faa120f020c32 (diff) |
nfsd41: use current stateid by value
Signed-off-by: Tigran Mkrtchyan <kofemann@gmail.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Diffstat (limited to 'fs/nfsd/xdr4.h')
-rw-r--r-- | fs/nfsd/xdr4.h | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/fs/nfsd/xdr4.h b/fs/nfsd/xdr4.h index 3c1ddd7f13a4..12789eb3f911 100644 --- a/fs/nfsd/xdr4.h +++ b/fs/nfsd/xdr4.h | |||
@@ -43,6 +43,13 @@ | |||
43 | #define NFSD4_MAX_TAGLEN 128 | 43 | #define NFSD4_MAX_TAGLEN 128 |
44 | #define XDR_LEN(n) (((n) + 3) & ~3) | 44 | #define XDR_LEN(n) (((n) + 3) & ~3) |
45 | 45 | ||
46 | #define CURRENT_STATE_ID_FLAG (1<<0) | ||
47 | #define SAVED_STATE_ID_FLAG (1<<1) | ||
48 | |||
49 | #define SET_STATE_ID(c, f) ((c)->sid_flags |= (f)) | ||
50 | #define HAS_STATE_ID(c, f) ((c)->sid_flags & (f)) | ||
51 | #define CLEAR_STATE_ID(c, f) ((c)->sid_flags &= ~(f)) | ||
52 | |||
46 | struct nfsd4_compound_state { | 53 | struct nfsd4_compound_state { |
47 | struct svc_fh current_fh; | 54 | struct svc_fh current_fh; |
48 | struct svc_fh save_fh; | 55 | struct svc_fh save_fh; |
@@ -54,8 +61,10 @@ struct nfsd4_compound_state { | |||
54 | size_t iovlen; | 61 | size_t iovlen; |
55 | u32 minorversion; | 62 | u32 minorversion; |
56 | u32 status; | 63 | u32 status; |
57 | const stateid_t *current_stateid; | 64 | stateid_t current_stateid; |
58 | const stateid_t *save_stateid; | 65 | stateid_t save_stateid; |
66 | /* to indicate current and saved state id presents */ | ||
67 | u32 sid_flags; | ||
59 | }; | 68 | }; |
60 | 69 | ||
61 | static inline bool nfsd4_has_session(struct nfsd4_compound_state *cs) | 70 | static inline bool nfsd4_has_session(struct nfsd4_compound_state *cs) |