diff options
-rw-r--r-- | fs/nfsd/nfs4state.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index bb95275e7bae..31f7082df49f 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c | |||
@@ -1526,6 +1526,15 @@ out: | |||
1526 | return status; | 1526 | return status; |
1527 | } | 1527 | } |
1528 | 1528 | ||
1529 | static inline int | ||
1530 | nfs4_check_delegmode(struct nfs4_delegation *dp, int flags) | ||
1531 | { | ||
1532 | if ((flags & WR_STATE) && (dp->dl_type == NFS4_OPEN_DELEGATE_READ)) | ||
1533 | return nfserr_openmode; | ||
1534 | else | ||
1535 | return nfs_ok; | ||
1536 | } | ||
1537 | |||
1529 | static struct nfs4_delegation * | 1538 | static struct nfs4_delegation * |
1530 | find_delegation_file(struct nfs4_file *fp, stateid_t *stid) | 1539 | find_delegation_file(struct nfs4_file *fp, stateid_t *stid) |
1531 | { | 1540 | { |
@@ -1961,15 +1970,6 @@ out: | |||
1961 | } | 1970 | } |
1962 | 1971 | ||
1963 | static inline int | 1972 | static inline int |
1964 | nfs4_check_delegmode(struct nfs4_delegation *dp, int flags) | ||
1965 | { | ||
1966 | if ((flags & WR_STATE) && (dp->dl_type == NFS4_OPEN_DELEGATE_READ)) | ||
1967 | return nfserr_openmode; | ||
1968 | else | ||
1969 | return nfs_ok; | ||
1970 | } | ||
1971 | |||
1972 | static inline int | ||
1973 | check_special_stateids(svc_fh *current_fh, stateid_t *stateid, int flags) | 1973 | check_special_stateids(svc_fh *current_fh, stateid_t *stateid, int flags) |
1974 | { | 1974 | { |
1975 | /* Trying to call delegreturn with a special stateid? Yuch: */ | 1975 | /* Trying to call delegreturn with a special stateid? Yuch: */ |