diff options
author | Trond Myklebust <trond.myklebust@primarydata.com> | 2015-03-25 18:58:53 -0400 |
---|---|---|
committer | Trond Myklebust <trond.myklebust@primarydata.com> | 2015-03-27 12:39:37 -0400 |
commit | a0815d556d1cfb686b46995f86fb081f623fa720 (patch) | |
tree | fd6edd1d18bc1a6633a7e968089d089dd4aec6cd /fs/nfs/direct.c | |
parent | 9e1681c2e74bdd84bad6f74b47a4d88ad2f433df (diff) |
NFSv4.1/pnfs: Ensure that writes respect the O_SYNC flag when doing O_DIRECT
If the caller does not specify the O_SYNC flag, then it is legitimate
to return from O_DIRECT without doing a pNFS layoutcommit operation.
However if the file is opened O_DIRECT|O_SYNC then we'd better get it
right.
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
Diffstat (limited to 'fs/nfs/direct.c')
-rw-r--r-- | fs/nfs/direct.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/nfs/direct.c b/fs/nfs/direct.c index 51f617e45fd1..018a06a062bd 100644 --- a/fs/nfs/direct.c +++ b/fs/nfs/direct.c | |||
@@ -1034,6 +1034,7 @@ ssize_t nfs_file_direct_write(struct kiocb *iocb, struct iov_iter *iter, | |||
1034 | if (i_size_read(inode) < iocb->ki_pos) | 1034 | if (i_size_read(inode) < iocb->ki_pos) |
1035 | i_size_write(inode, iocb->ki_pos); | 1035 | i_size_write(inode, iocb->ki_pos); |
1036 | spin_unlock(&inode->i_lock); | 1036 | spin_unlock(&inode->i_lock); |
1037 | generic_write_sync(file, pos, result); | ||
1037 | } | 1038 | } |
1038 | } | 1039 | } |
1039 | nfs_direct_req_release(dreq); | 1040 | nfs_direct_req_release(dreq); |