diff --git a/[refs] b/[refs]
index e8b4b18f3945..ccae48bf8dc4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c36047d729a3fa080dd194b20b684cc9fe73e90c
+refs/heads/master: 0df49b911db2b22ea808b596070b1cc65c23d148
diff --git a/trunk/fs/btrfs/async-thread.c b/trunk/fs/btrfs/async-thread.c
index e1e49715459e..4229450b7596 100644
--- a/trunk/fs/btrfs/async-thread.c
+++ b/trunk/fs/btrfs/async-thread.c
@@ -171,7 +171,8 @@ static int worker_loop(void *arg)
 		} else {
 			set_current_state(TASK_INTERRUPTIBLE);
 			spin_unlock_irq(&worker->lock);
-			schedule();
+			if (!kthread_should_stop())
+				schedule();
 			__set_current_state(TASK_RUNNING);
 		}
 	} while (!kthread_should_stop());