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

trondmypd · trondmypd · commit 8b7d9d09b24f · 2016-07-14T12:42:40.000-04:00
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 &lt;trond.myklebust@primarydata.com&gt;
diff --git 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);

Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ nfs4_file_open(struct inode inode, struct file filp)`
`66`	`66`	`if (openflags & O_TRUNC) {`
`67`	`67`	`attr.ia_valid \|= ATTR_SIZE;`
`68`	`68`	`attr.ia_size = 0;`
`69`		`- nfs_sync_inode(inode);`
	`69`	`+ filemap_write_and_wait(inode->i_mapping);`
`70`	`70`	`}`
`71`	`71`
`72`	`72`	`inode = NFS_PROTO(dir)->open_context(dir, ctx, openflags, &attr, NULL);`