From f5f563e3b1ee03dcb7f2a51f8baf2d3dc85f6270 Mon Sep 17 00:00:00 2001
From: Chris Mason <chris.mason@oracle.com>
Date: Mon, 26 Nov 2007 19:47:05 -0500
Subject: [PATCH] --- yaml --- r: 128552 b: refs/heads/master c:
 8790bad7fb5ac4929dcd52c5dd8d6b81f8c05be8 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 7fb5e93252bd..fa2294c80a86 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 793955bca66c99defdffc857ae6eb7e8431d6bbe
+refs/heads/master: 8790bad7fb5ac4929dcd52c5dd8d6b81f8c05be8
diff --git a/trunk/fs/btrfs/disk-io.c b/trunk/fs/btrfs/disk-io.c
index 28e9ef8a3253..8a74f9027d65 100644
--- a/trunk/fs/btrfs/disk-io.c
+++ b/trunk/fs/btrfs/disk-io.c
@@ -210,7 +210,7 @@ static int btree_writepages(struct address_space *mapping,
 {
 	struct extent_map_tree *tree;
 	tree = &BTRFS_I(mapping->host)->extent_tree;
-	if (wbc->sync_mode == WB_SYNC_NONE) {
+	if (wbc->sync_mode == WB_SYNC_NONE && current_is_pdflush()) {
 		u64 num_dirty;
 		u64 start = 0;
 		unsigned long thresh = 96 * 1024 * 1024;