diff options
| author | Neil Brown <neilb@cse.unsw.edu.au> | 2005-01-04 05:47:55 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-01-04 05:47:55 -0800 |
| commit | a733375f250c756d166c92c922cf0c1dab23122c (patch) | |
| tree | 83ae3499619abd2ccac168f0a4a7961cec424857 /include/linux | |
| parent | 4798d59e2391e5bd66e3af6be4ba5c22fbccbf3d (diff) | |
[PATCH] knfsd: move nfserr_openmode checking from nfsd_read/write into nfs4_preprocess_stateid_op() in preparation for delegation state.
Signed-off-by: Andy Adamson <andros@citi.umich.edu>
Signed-off-by: Neil Brown <neilb@cse.unsw.edu.au>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/nfsd/state.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/include/linux/nfsd/state.h b/include/linux/nfsd/state.h index a56399b985a4..5e6c2ab760fd 100644 --- a/include/linux/nfsd/state.h +++ b/include/linux/nfsd/state.h @@ -231,8 +231,9 @@ struct nfs4_stateid { #define CONFIRM 0x00000002 #define OPEN_STATE 0x00000004 #define LOCK_STATE 0x00000008 -#define RDWR_STATE 0x00000010 -#define CLOSE_STATE 0x00000020 +#define RD_STATE 0x00000010 +#define WR_STATE 0x00000020 +#define CLOSE_STATE 0x00000040 #define seqid_mutating_err(err) \ (((err) != nfserr_stale_clientid) && \ @@ -243,7 +244,7 @@ struct nfs4_stateid { extern time_t nfs4_laundromat(void); extern int nfsd4_renew(clientid_t *clid); extern int nfs4_preprocess_stateid_op(struct svc_fh *current_fh, - stateid_t *stateid, int flags, struct nfs4_stateid **stpp); + stateid_t *stateid, int flags); extern int nfs4_share_conflict(struct svc_fh *current_fh, unsigned int deny_type); extern void nfs4_lock_state(void); |