From: Chris Mason <chris.mason@oracle.com>
Date: Thu, 11 Sep 2008 21:42:42 +0000 (-0400)
Subject: Btrfs: Disable the dir fsync optimization to skip logging the dir sometimes
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=9623f9a3894ec95fe140ee5460bb840ac53bc6a0;p=deliverable%2Flinux.git

Btrfs: Disable the dir fsync optimization to skip logging the dir sometimes

More testing has turned up a bug, disable this for now.

Signed-off-by: Chris Mason <chris.mason@oracle.com>
---

diff --git a/fs/btrfs/tree-log.c b/fs/btrfs/tree-log.c
index bfa710800963..56de3fb2d8d5 100644
--- a/fs/btrfs/tree-log.c
+++ b/fs/btrfs/tree-log.c
@@ -2686,8 +2686,7 @@ next_slot:
 		ins_nr = 0;
 	}
 	WARN_ON(ins_nr);
-	if (inode_only == LOG_INODE_ALL && S_ISDIR(inode->i_mode) &&
-	    BTRFS_I(inode)->log_dirty_trans >= trans->transid) {
+	if (inode_only == LOG_INODE_ALL && S_ISDIR(inode->i_mode)) {
 		btrfs_release_path(root, path);
 		btrfs_release_path(log, dst_path);
 		BTRFS_I(inode)->log_dirty_trans = 0;