From: Trond Myklebust <trond.myklebust@primarydata.com>
Date: Thu, 14 Jul 2016 16:42:40 +0000 (-0400)
Subject: NFSv4: Revert "Truncating file opens should also sync O_DIRECT writes"
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=8b7d9d09b24f4ef16f7ae34b6d9e59857fda0870;p=linux-beck.git

NFSv4: Revert "Truncating file opens should also sync O_DIRECT writes"

We're not holding any locks, so both nfs_wb_all() and inode_dio_wait()
are unenforcible and have livelock potential. Just limit ourselves to
flushing out the data.

Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
---

diff --git a/fs/nfs/nfs4file.c b/fs/nfs/nfs4file.c
index 7cdc0ab9e6f5..d085ad794884 100644
--- a/fs/nfs/nfs4file.c
+++ b/fs/nfs/nfs4file.c
@@ -66,7 +66,7 @@ nfs4_file_open(struct inode *inode, struct file *filp)
 	if (openflags & O_TRUNC) {
 		attr.ia_valid |= ATTR_SIZE;
 		attr.ia_size = 0;
-		nfs_sync_inode(inode);
+		filemap_write_and_wait(inode->i_mapping);
 	}
 
 	inode = NFS_PROTO(dir)->open_context(dir, ctx, openflags, &attr, NULL);