NFS: Clean up the callers of nfs_wb_all()
There is no need to flush out writes before calling nfs_wb_all(). Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
This commit is contained in:
parent
af7fa16506
commit
1b924e5f87
@ -268,14 +268,6 @@ out:
|
|||||||
return status;
|
return status;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Sync all data to disk upon delegation return */
|
|
||||||
static void nfs_msync_inode(struct inode *inode)
|
|
||||||
{
|
|
||||||
filemap_fdatawrite(inode->i_mapping);
|
|
||||||
nfs_wb_all(inode);
|
|
||||||
filemap_fdatawait(inode->i_mapping);
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Basic procedure for returning a delegation to the server
|
* Basic procedure for returning a delegation to the server
|
||||||
*/
|
*/
|
||||||
@ -367,7 +359,7 @@ int nfs_inode_return_delegation(struct inode *inode)
|
|||||||
delegation = nfs_detach_delegation_locked(nfsi, NULL, clp);
|
delegation = nfs_detach_delegation_locked(nfsi, NULL, clp);
|
||||||
spin_unlock(&clp->cl_lock);
|
spin_unlock(&clp->cl_lock);
|
||||||
if (delegation != NULL) {
|
if (delegation != NULL) {
|
||||||
nfs_msync_inode(inode);
|
nfs_wb_all(inode);
|
||||||
err = __nfs_inode_return_delegation(inode, delegation, 1);
|
err = __nfs_inode_return_delegation(inode, delegation, 1);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -413,10 +413,8 @@ nfs_setattr(struct dentry *dentry, struct iattr *attr)
|
|||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
/* Write all dirty data */
|
/* Write all dirty data */
|
||||||
if (S_ISREG(inode->i_mode)) {
|
if (S_ISREG(inode->i_mode))
|
||||||
filemap_write_and_wait(inode->i_mapping);
|
|
||||||
nfs_wb_all(inode);
|
nfs_wb_all(inode);
|
||||||
}
|
|
||||||
|
|
||||||
fattr = nfs_alloc_fattr();
|
fattr = nfs_alloc_fattr();
|
||||||
if (fattr == NULL)
|
if (fattr == NULL)
|
||||||
|
Loading…
Reference in New Issue
Block a user