diff options
| author | Bryan Schumaker <bjschuma@netapp.com> | 2012-06-20 15:53:43 -0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2012-06-29 11:46:44 -0400 |
| commit | 011e2a7fd5e9e0c2fdba6b9466d53fc437f8bfaf (patch) | |
| tree | b88d11754a6ed0a4cea439dc43a39fb88a5b05a8 /fs/nfs/delegation.h | |
| parent | a5c58892b427a2752e3ec44b0aad4ce9221dc63b (diff) | |
| download | linux-011e2a7fd5e9e0c2fdba6b9466d53fc437f8bfaf.tar.gz linux-011e2a7fd5e9e0c2fdba6b9466d53fc437f8bfaf.tar.bz2 linux-011e2a7fd5e9e0c2fdba6b9466d53fc437f8bfaf.zip | |
NFS: Create a have_delegation rpc_op
Delegations are a v4 feature, so push them out of the generic code.
Signed-off-by: Bryan Schumaker <bjschuma@netapp.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/nfs/delegation.h')
| -rw-r--r-- | fs/nfs/delegation.h | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/fs/nfs/delegation.h b/fs/nfs/delegation.h index 206db5679996..d134fc5fda70 100644 --- a/fs/nfs/delegation.h +++ b/fs/nfs/delegation.h @@ -56,14 +56,9 @@ int nfs4_lock_delegation_recall(struct nfs4_state *state, struct file_lock *fl); bool nfs4_copy_delegation_stateid(nfs4_stateid *dst, struct inode *inode, fmode_t flags); void nfs_mark_delegation_referenced(struct nfs_delegation *delegation); -int nfs_have_delegation(struct inode *inode, fmode_t flags); +int nfs4_have_delegation(struct inode *inode, fmode_t flags); #else -static inline int nfs_have_delegation(struct inode *inode, fmode_t flags) -{ - return 0; -} - static inline int nfs_inode_return_delegation(struct inode *inode) { nfs_wb_all(inode); @@ -73,7 +68,7 @@ static inline int nfs_inode_return_delegation(struct inode *inode) static inline int nfs_have_delegated_attributes(struct inode *inode) { - return nfs_have_delegation(inode, FMODE_READ) && + return NFS_PROTO(inode)->have_delegation(inode, FMODE_READ) && !(NFS_I(inode)->cache_validity & NFS_INO_REVAL_FORCED); } |