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

Commit 7e94d6c4 authored by Trond Myklebust's avatar Trond Myklebust
Browse files

NFS: Don't fsync twice for O_SYNC/IS_SYNC files 



generic_file_write_iter() will already do an fsync on our behalf
if the file descriptor is O_SYNC or the file is marked as IS_SYNC.

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

fs/nfs/file.c

+3 −5
Original line number Diff line number Diff line
@@ -645,12 +645,10 @@ static const struct vm_operations_struct nfs_file_vm_ops = { 
	.page_mkwrite = nfs_vm_page_mkwrite,

};



static int nfs_need_sync_write(struct file *filp, struct inode *inode)

static int nfs_need_check_write(struct file *filp, struct inode *inode)

{

	struct nfs_open_context *ctx;



	if (IS_SYNC(inode) || (filp->f_flags & O_DSYNC))

		return 1;

	ctx = nfs_file_open_context(filp);

	if (test_bit(NFS_CONTEXT_ERROR_WRITE, &ctx->flags) ||

	    nfs_ctx_key_to_expire(ctx))
@@ -700,8 +698,8 @@ ssize_t nfs_file_write(struct kiocb *iocb, struct iov_iter *from) 
	if (result > 0)

		written = result;



	/* Return error values for O_DSYNC and IS_SYNC() */

	if (result >= 0 && nfs_need_sync_write(file, inode)) {

	/* Return error values */

	if (result >= 0 && nfs_need_check_write(file, inode)) {

		int err = vfs_fsync(file, 0);

		if (err < 0)

			result = err;