[6/7,v5] ocfs2: do not fallback to buffer I/O write if appending

Commit Message

Joseph Qi Oct. 28, 2014, 1:20 p.m. UTC

From: Weiwei Wang <[e-mail]>

Now we can do direct io and do not fallback to buffered IO any more
in case of append O_DIRECT write.

Signed-off-by: Weiwei Wang <[e-mail]>
Signed-off-by: Joseph Qi <[e-mail]>
---
 fs/ocfs2/file.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

Patch

diff --git a/fs/ocfs2/file.c b/fs/ocfs2/file.c
index cb444df..7857f61 100644
--- a/fs/ocfs2/file.c
+++ b/fs/ocfs2/file.c
@@ -2116,6 +2116,9 @@  static int ocfs2_prepare_inode_for_write(struct file *file,
 	struct dentry *dentry = file->f_path.dentry;
 	struct inode *inode = dentry->d_inode;
 	loff_t saved_pos = 0, end;
+	struct ocfs2_super *osb = OCFS2_SB(inode->i_sb);
+	int full_coherency = !(osb->s_mount_opt &
+		OCFS2_MOUNT_COHERENCY_BUFFERED);

 	/*
 	 * We start with a read level meta lock and only jump to an ex
@@ -2204,7 +2207,7 @@  static int ocfs2_prepare_inode_for_write(struct file *file,
 		 * one node could wind up truncating another
 		 * nodes writes.
 		 */
-		if (end > i_size_read(inode)) {
+		if (end > i_size_read(inode) && !full_coherency) {
 			*direct_io = 0;
 			break;
 		}