Skip to contentSkip to conversation

OCFS2 bugfix in fdatasync and a cleanup

PATCH New Jan Kara 3 participants 6 messages Aug 5, 2010 – Aug 12, 2010 OCFS2

lore
Share & tools
lore

Jan Kara

author
#0 lore raw

v3 cover OCFS2 bugfix in fdatasync and a cleanup

Hi,

I've updated the changelog since the last version. Otherwise the patches are
the same. They add a forgotten cache flush in fdatasync path and sligthly cleanup fdatasync code. Joel, could you please merge them? Thanks.

Honza

author
#1 lore raw

PATCH v3 1/2 ocfs2: Flush drive's caches on fdatasync

When 'barrier' mount option is specified, we have to issue a cache flush during fdatasync(2). We have to do this even if inode doesn't have I_DIRTY_DATASYNC set because we still have to get written *data* to disk so that they are not lost in case of crash.

Acked-by Tao Ma <[email protected]>
Signed-off-by Jan Kara <[email protected]>
---
 fs/ocfs2/file.c |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)
fs/ocfs2/file.c +10 -1
index 2b10b36..3ed8efd 100644
@@ -36,6 +36,7 @@
 #include <linux/writeback.h>
 #include <linux/falloc.h>
 #include <linux/quotaops.h>
+#include <linux/blkdev.h>
 
 #define MLOG_MASK_PREFIX ML_INODE
 #include <cluster/masklog.h>

@@ -190,8 +191,16 @@ static int ocfs2_sync_file(struct file *file, int datasync)
 	if (err)
 		goto bail;
 
-	if (datasync && !(inode->i_state & I_DIRTY_DATASYNC))
+	if (datasync && !(inode->i_state & I_DIRTY_DATASYNC)) {
+		/*
+		 * We still have to flush drive's caches to get data to the
+		 * platter
+		 */
+		if (osb->s_mount_opt & OCFS2_MOUNT_BARRIER)
+			blkdev_issue_flush(inode->i_sb->s_bdev, GFP_KERNEL,
+					   NULL, BLKDEV_IFL_WAIT);
 		goto bail;
+	}
 
 	journal = osb->journal->j_journal;
 	err = jbd2_journal_force_commit(journal);
Signature · 1 line
1.6.4.2
#2 lore raw

PATCH v3 1/2 ocfs2: Flush drive's caches on fdatasync

Quoted 7 lines · Jan Kara

When 'barrier' mount option is specified, we have to issue a cache flush during fdatasync(2). We have to do this even if inode doesn't have I_DIRTY_DATASYNC set because we still have to get written *data* to disk so that they are not lost in case of crash.

Acked-by Tao Ma <[email protected]>
Signed-off-by Jan Kara <[email protected]>

This patch is now in the merge-window branch of ocfs2.git

Joel

Signature · 9 lines
Life's Little Instruction Book #335

	"Every so often, push your luck."

Joel Becker
Consulting Software Developer
Oracle
E-mail: joel.becker at oracle.com
Phone: (650) 506-8127
author
#3 lore raw

PATCH v3 2/2 ocfs2: Remove ocfs2_sync_inode()

In reply to Jan Kara

ocfs2_sync_inode() is used only from ocfs2_sync_file(). But all data has already been written before calling ocfs2_sync_file() and ocfs2 doesn't use inode's private_list for tracking metadata buffers thus sync_mapping_buffers() is superfluous as well.

Signed-off-by Jan Kara <[email protected]>
---
 fs/ocfs2/file.c |   10 ----------
 1 files changed, 0 insertions(+), 10 deletions(-)
fs/ocfs2/file.c +0 -10
index 3ed8efd..b7cfa6b 100644
@@ -64,12 +64,6 @@
 
 #include "buffer_head_io.h"
 
-static int ocfs2_sync_inode(struct inode *inode)
-{
-	filemap_fdatawrite(inode->i_mapping);
-	return sync_mapping_buffers(inode->i_mapping);
-}
-
 static int ocfs2_init_file_private(struct inode *inode, struct file *file)
 {
 	struct ocfs2_file_private *fp;

@@ -187,10 +181,6 @@ static int ocfs2_sync_file(struct file *file, int datasync)
 	mlog_entry("(0x%p, 0x%p, %d, '%.*s')\n", file, dentry, datasync,
 		   dentry->d_name.len, dentry->d_name.name);
 
-	err = ocfs2_sync_inode(dentry->d_inode);
-	if (err)
-		goto bail;
-
 	if (datasync && !(inode->i_state & I_DIRTY_DATASYNC)) {
 		/*
 		 * We still have to flush drive's caches to get data to the
Signature · 1 line
1.6.4.2
#4 lore raw

PATCH v3 2/2 ocfs2: Remove ocfs2_sync_inode()

Quoted 6 lines · Jan Kara

ocfs2_sync_inode() is used only from ocfs2_sync_file(). But all data has already been written before calling ocfs2_sync_file() and ocfs2 doesn't use inode's private_list for tracking metadata buffers thus sync_mapping_buffers() is superfluous as well.

Signed-off-by Jan Kara <[email protected]>
Acked-by Mark Fasheh <[email protected]>
	--Mark

--
Mark Fasheh

#5 lore raw

PATCH v3 2/2 ocfs2: Remove ocfs2_sync_inode()

In reply to Jan Kara
Quoted 6 lines · Jan Kara

ocfs2_sync_inode() is used only from ocfs2_sync_file(). But all data has already been written before calling ocfs2_sync_file() and ocfs2 doesn't use inode's private_list for tracking metadata buffers thus sync_mapping_buffers() is superfluous as well.

Signed-off-by Jan Kara <[email protected]>

This patch is now in the merge-window branch of ocfs2.git

Joel

Signature · 9 lines
"What no boss of a programmer can ever understand is that a programmer
 is working when he's staring out of the window"
	- With apologies to Burton Rascoe

Joel Becker
Consulting Software Developer
Oracle
E-mail: joel.becker at oracle.com
Phone: (650) 506-8127