From 7e54721050b8820391dd961f110c14d83c96e2ba Mon Sep 17 00:00:00 2001
From: Josef Bacik <jbacik@fusionio.com>
Date: Tue, 18 Dec 2012 15:16:34 -0500
Subject: [PATCH] --- yaml --- r: 349160 b: refs/heads/master c:
 72bcd99d450cb1dde8bf13c3b65fc5883b2a3893 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 1f8882fc9c19..e202a20a5646 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 97547676570b3bd908560741315bf4b7d635bcf5
+refs/heads/master: 72bcd99d450cb1dde8bf13c3b65fc5883b2a3893
diff --git a/trunk/fs/btrfs/extent-tree.c b/trunk/fs/btrfs/extent-tree.c
index d133edfcd449..61fefda74ff5 100644
--- a/trunk/fs/btrfs/extent-tree.c
+++ b/trunk/fs/btrfs/extent-tree.c
@@ -3997,7 +3997,7 @@ static int reserve_metadata_bytes(struct btrfs_root *root,
 	 * We make the other tasks wait for the flush only when we can flush
 	 * all things.
 	 */
-	if (ret && flush == BTRFS_RESERVE_FLUSH_ALL) {
+	if (ret && flush != BTRFS_RESERVE_NO_FLUSH) {
 		flushing = true;
 		space_info->flush = 1;
 	}