--- Revision 316565343030
+++ Revision 333964363564
@@ -16,7 +16,9 @@
 +		nolock = true;
 +	} else if (btrfs_test_opt(fs_info, FLUSHONCOMMIT)) {
 +		spin_lock(&fs_info->trans_lock);
-+		if (fs_info->running_transaction)
++		if (fs_info->running_transaction &&
++		    fs_info->running_transaction->state >=
++		    TRANS_STATE_COMMIT_START)
 +			nolock = true;
 +		spin_unlock(&fs_info->trans_lock);
 +	}