From 82e44040791d6bb37ed006722fded108066bf7bf Mon Sep 17 00:00:00 2001
From: Julia Lawall <julia@diku.dk>
Date: Wed, 22 Jul 2009 16:49:00 -0400
Subject: [PATCH] --- yaml --- r: 155912 b: refs/heads/master c:
 29c5e8ce01f9dad7e24b99c21e4f836d6b0289e0 h: refs/heads/master v: v3

---
 [refs]                        | 2 +-
 trunk/fs/btrfs/async-thread.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 47c7efd7a4f3..627646402fc6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4a8c9a62d7f7f058eed4b8a6f2c890a887778093
+refs/heads/master: 29c5e8ce01f9dad7e24b99c21e4f836d6b0289e0
diff --git a/trunk/fs/btrfs/async-thread.c b/trunk/fs/btrfs/async-thread.c
index 6e4f6c50a120..019e8af449ab 100644
--- a/trunk/fs/btrfs/async-thread.c
+++ b/trunk/fs/btrfs/async-thread.c
@@ -424,11 +424,11 @@ int btrfs_requeue_work(struct btrfs_work *work)
 	 * list
 	 */
 	if (worker->idle) {
-		spin_lock_irqsave(&worker->workers->lock, flags);
+		spin_lock(&worker->workers->lock);
 		worker->idle = 0;
 		list_move_tail(&worker->worker_list,
 			       &worker->workers->worker_list);
-		spin_unlock_irqrestore(&worker->workers->lock, flags);
+		spin_unlock(&worker->workers->lock);
 	}
 	if (!worker->working) {
 		wake = 1;