[Ocfs2-devel] [PATCH 0/2 v3] OCFS2 bugfix in fdatasync and a cleanup

[Ocfs2-devel] [PATCH 0/2 v3] OCFS2 bugfix in fdatasync and a cleanup

[Jan Kara]

  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

[Ocfs2-devel] [PATCH 1/2 v3] ocfs2: Flush drive's caches on fdatasync

[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 <tao.ma@oracle.com>
Signed-off-by: Jan Kara <jack@suse.cz>
---
 fs/ocfs2/file.c |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)

diff --git a/fs/ocfs2/file.c b/fs/ocfs2/file.c
index 2b10b36..3ed8efd 100644
--- a/fs/ocfs2/file.c
+++ b/fs/ocfs2/file.c
@@ -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);
-- 
1.6.4.2

[Ocfs2-devel] [PATCH 2/2 v3] ocfs2: Remove ocfs2_sync_inode()

[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 <jack@suse.cz>
---
 fs/ocfs2/file.c |   10 ----------
 1 files changed, 0 insertions(+), 10 deletions(-)

diff --git a/fs/ocfs2/file.c b/fs/ocfs2/file.c
index 3ed8efd..b7cfa6b 100644
--- a/fs/ocfs2/file.c
+++ b/fs/ocfs2/file.c
@@ -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
-- 
1.6.4.2

[Ocfs2-devel] [PATCH 2/2 v3] ocfs2: Remove ocfs2_sync_inode()

[Mark Fasheh]

On Thu, Aug 05, 2010 at 08:32:46PM +0200, Jan Kara wrote:
> 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 <jack@suse.cz>
Acked-by: Mark Fasheh <mfasheh@suse.com>
	--Mark

--
Mark Fasheh

[Ocfs2-devel] [PATCH 1/2 v3] ocfs2: Flush drive's caches on fdatasync

[Joel Becker]

On Thu, Aug 05, 2010 at 08:32:45PM +0200, Jan Kara wrote:
> 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 <tao.ma@oracle.com>
> Signed-off-by: Jan Kara <jack@suse.cz>

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

Joel

-- 

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

[Ocfs2-devel] [PATCH 2/2 v3] ocfs2: Remove ocfs2_sync_inode()

[Joel Becker]

On Thu, Aug 05, 2010 at 08:32:46PM +0200, Jan Kara wrote:
> 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 <jack@suse.cz>


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

Joel
 

-- 

"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