From: NeilBrown Additional minor code reshuffling to prepare for claim_deleg_cur support. Signed-off-by: Andy Adamson Signed-off-by: J. Bruce Fields Signed-off-by: Neil Brown Signed-off-by: Andrew Morton --- 25-akpm/fs/nfsd/nfs4state.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff -puN fs/nfsd/nfs4state.c~nfsd4-nfs4_check_delegmode fs/nfsd/nfs4state.c --- 25/fs/nfsd/nfs4state.c~nfsd4-nfs4_check_delegmode 2005-04-07 19:09:49.000000000 -0700 +++ 25-akpm/fs/nfsd/nfs4state.c 2005-04-07 19:09:49.000000000 -0700 @@ -1526,6 +1526,15 @@ out: return status; } +static inline int +nfs4_check_delegmode(struct nfs4_delegation *dp, int flags) +{ + if ((flags & WR_STATE) && (dp->dl_type == NFS4_OPEN_DELEGATE_READ)) + return nfserr_openmode; + else + return nfs_ok; +} + static struct nfs4_delegation * find_delegation_file(struct nfs4_file *fp, stateid_t *stid) { @@ -1961,15 +1970,6 @@ out: } static inline int -nfs4_check_delegmode(struct nfs4_delegation *dp, int flags) -{ - if ((flags & WR_STATE) && (dp->dl_type == NFS4_OPEN_DELEGATE_READ)) - return nfserr_openmode; - else - return nfs_ok; -} - -static inline int check_special_stateids(svc_fh *current_fh, stateid_t *stateid, int flags) { /* Trying to call delegreturn with a special stateid? Yuch: */ _