mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-14 12:37:32 +00:00
NFS: Add a helper to sync both O_DIRECT and buffered writes
Then apply it to nfs_setattr() and nfs_getattr(). Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
This commit is contained in:
parent
67af7611ec
commit
4d346bea8f
1 changed files with 9 additions and 6 deletions
|
@ -133,6 +133,12 @@ void nfs_evict_inode(struct inode *inode)
|
||||||
nfs_clear_inode(inode);
|
nfs_clear_inode(inode);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static int nfs_sync_inode(struct inode *inode)
|
||||||
|
{
|
||||||
|
nfs_inode_dio_wait(inode);
|
||||||
|
return nfs_wb_all(inode);
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* nfs_sync_mapping - helper to flush all mmapped dirty data to disk
|
* nfs_sync_mapping - helper to flush all mmapped dirty data to disk
|
||||||
*/
|
*/
|
||||||
|
@ -525,10 +531,8 @@ nfs_setattr(struct dentry *dentry, struct iattr *attr)
|
||||||
trace_nfs_setattr_enter(inode);
|
trace_nfs_setattr_enter(inode);
|
||||||
|
|
||||||
/* Write all dirty data */
|
/* Write all dirty data */
|
||||||
if (S_ISREG(inode->i_mode)) {
|
if (S_ISREG(inode->i_mode))
|
||||||
nfs_inode_dio_wait(inode);
|
nfs_sync_inode(inode);
|
||||||
nfs_wb_all(inode);
|
|
||||||
}
|
|
||||||
|
|
||||||
fattr = nfs_alloc_fattr();
|
fattr = nfs_alloc_fattr();
|
||||||
if (fattr == NULL)
|
if (fattr == NULL)
|
||||||
|
@ -644,8 +648,7 @@ int nfs_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat)
|
||||||
trace_nfs_getattr_enter(inode);
|
trace_nfs_getattr_enter(inode);
|
||||||
/* Flush out writes to the server in order to update c/mtime. */
|
/* Flush out writes to the server in order to update c/mtime. */
|
||||||
if (S_ISREG(inode->i_mode)) {
|
if (S_ISREG(inode->i_mode)) {
|
||||||
nfs_inode_dio_wait(inode);
|
err = nfs_sync_inode(inode);
|
||||||
err = filemap_write_and_wait(inode->i_mapping);
|
|
||||||
if (err)
|
if (err)
|
||||||
goto out;
|
goto out;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue