Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4d346bea authored by Trond Myklebust's avatar Trond Myklebust
Browse files

NFS: Add a helper to sync both O_DIRECT and buffered writes 



Then apply it to nfs_setattr() and nfs_getattr().

Signed-off-by: default avatarTrond Myklebust <trond.myklebust@primarydata.com>
parent 67af7611

fs/nfs/inode.c

+9 −6
Original line number Original line Diff line number Diff line
@@ -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;

	}

	}