forked from Minki/linux
NFS: nfs_inode_return_delegation() should always flush dirty data
The assumption is that if you are in a situation where you need to return the delegation, then you should probably stop caching the data anyway. Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
This commit is contained in:
parent
14546c3375
commit
c57d1bc5e0
@ -380,6 +380,10 @@ void nfs_inode_return_delegation_noreclaim(struct inode *inode)
|
||||
* nfs_inode_return_delegation - synchronously return a delegation
|
||||
* @inode: inode to process
|
||||
*
|
||||
* This routine will always flush any dirty data to disk on the
|
||||
* assumption that if we need to return the delegation, then
|
||||
* we should stop caching.
|
||||
*
|
||||
* Returns zero on success, or a negative errno value.
|
||||
*/
|
||||
int nfs_inode_return_delegation(struct inode *inode)
|
||||
@ -389,10 +393,10 @@ int nfs_inode_return_delegation(struct inode *inode)
|
||||
struct nfs_delegation *delegation;
|
||||
int err = 0;
|
||||
|
||||
nfs_wb_all(inode);
|
||||
if (rcu_access_pointer(nfsi->delegation) != NULL) {
|
||||
delegation = nfs_detach_delegation(nfsi, server);
|
||||
if (delegation != NULL) {
|
||||
nfs_wb_all(inode);
|
||||
err = __nfs_inode_return_delegation(inode, delegation, 1);
|
||||
}
|
||||
}
|
||||
|
@ -66,6 +66,7 @@ static inline int nfs_have_delegation(struct inode *inode, fmode_t flags)
|
||||
|
||||
static inline int nfs_inode_return_delegation(struct inode *inode)
|
||||
{
|
||||
nfs_wb_all(inode);
|
||||
return 0;
|
||||
}
|
||||
#endif
|
||||
|
Loading…
Reference in New Issue
Block a user