From c699eef9d028c51fa313a8807d276d3dac085170 Mon Sep 17 00:00:00 2001
From: Chris Mason <chris.mason@oracle.com>
Date: Thu, 20 Oct 2011 15:45:37 -0400
Subject: [PATCH] --- yaml --- r: 274678 b: refs/heads/master c:
 cd354ad613a393424f85333ceed6b15e07fb94ae h: refs/heads/master v: v3

---
 [refs]                    | 2 +-
 trunk/fs/btrfs/tree-log.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 859e1a56fb4c..b91a838a7928 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dff51cd1c60856c28f5d22a571294c2b70b6b322
+refs/heads/master: cd354ad613a393424f85333ceed6b15e07fb94ae
diff --git a/trunk/fs/btrfs/tree-log.c b/trunk/fs/btrfs/tree-log.c
index 786639fca067..310ab22cfe58 100644
--- a/trunk/fs/btrfs/tree-log.c
+++ b/trunk/fs/btrfs/tree-log.c
@@ -2013,10 +2013,10 @@ int btrfs_sync_log(struct btrfs_trans_handle *trans,
 	/* wait for previous tree log sync to complete */
 	if (atomic_read(&root->log_commit[(index1 + 1) % 2]))
 		wait_log_commit(trans, root, root->log_transid - 1);
-
 	while (1) {
 		unsigned long batch = root->log_batch;
-		if (root->log_multiple_pids) {
+		/* when we're on an ssd, just kick the log commit out */
+		if (!btrfs_test_opt(root, SSD) && root->log_multiple_pids) {
 			mutex_unlock(&root->log_mutex);
 			schedule_timeout_uninterruptible(1);
 			mutex_lock(&root->log_mutex);