From 04727b1a65cdfceae41c01c3d0f05b53f0f99151 Mon Sep 17 00:00:00 2001
From: Chris Mason <chris.mason@oracle.com>
Date: Tue, 27 May 2008 10:52:17 -0400
Subject: [PATCH] --- yaml --- r: 128783 b: refs/heads/master c:
 da496f2acf61153e0d4d42ded6a53f3367939db0 h: refs/heads/master i:   128781:
 52d1a33a47b80fd62f9de8b8cc503670baafae48   128779:
 304432f4f273f11defc22a57b2fdff91acfe6e4f   128775:
 1f4f1a1c8b227b54c6ed5e335fe97a7ea2e5daa7   128767:
 b5be283968253d1d482a849afc0e118f80718d22 v: v3

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

diff --git a/[refs] b/[refs]
index 1878d6c664ed..6c2148e325fd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0ef3e66b6700eb8f052daa8b89443ff872fbbdfc
+refs/heads/master: da496f2acf61153e0d4d42ded6a53f3367939db0
diff --git a/trunk/fs/btrfs/disk-io.c b/trunk/fs/btrfs/disk-io.c
index d8a256d3c83a..016c0c0226ed 100644
--- a/trunk/fs/btrfs/disk-io.c
+++ b/trunk/fs/btrfs/disk-io.c
@@ -434,13 +434,6 @@ int btrfs_wq_submit_bio(struct btrfs_fs_info *fs_info, struct inode *inode,
 {
 	struct async_submit_bio *async;
 
-	/*
-	 * inline writerback should stay inline, only hop to the async
-	 * queue if we're pdflush
-	 */
-	if (!current_is_pdflush())
-		return submit_bio_hook(inode, rw, bio, mirror_num);
-
 	async = kmalloc(sizeof(*async), GFP_NOFS);
 	if (!async)
 		return -ENOMEM;