diff options
| author | Trond Myklebust <trond.myklebust@primarydata.com> | 2016-07-14 12:42:40 -0400 |
|---|---|---|
| committer | Trond Myklebust <trond.myklebust@primarydata.com> | 2016-07-14 12:42:40 -0400 |
| commit | 8b7d9d09b24f4ef16f7ae34b6d9e59857fda0870 (patch) | |
| tree | 405f45e9ee238e153bf901693e63537d7247f795 /fs | |
| parent | 9a773e7c8de2a34ae682624624e95a96b121b6d1 (diff) | |
| download | op-kernel-dev-8b7d9d09b24f4ef16f7ae34b6d9e59857fda0870.zip op-kernel-dev-8b7d9d09b24f4ef16f7ae34b6d9e59857fda0870.tar.gz | |
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>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/nfs/nfs4file.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfs/nfs4file.c b/fs/nfs/nfs4file.c index 7cdc0ab..d085ad7 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); |
