From 82a0cf1f029d85d1876b494ade754b16dade74af Mon Sep 17 00:00:00 2001 From: Chris Mason Date: Tue, 15 Sep 2009 20:00:36 -0400 Subject: [PATCH] --- yaml --- r: 165898 b: refs/heads/master c: 627e421a3f35ad6b52dc58982fb6f8a97c30dcd7 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 006386b178cb..61ed6621b97b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3e99d8eb347c93a5d38081380b8c9e69b203212e +refs/heads/master: 627e421a3f35ad6b52dc58982fb6f8a97c30dcd7 diff --git a/trunk/fs/btrfs/async-thread.c b/trunk/fs/btrfs/async-thread.c index 73df627ab8ab..80e33bc96c84 100644 --- a/trunk/fs/btrfs/async-thread.c +++ b/trunk/fs/btrfs/async-thread.c @@ -185,7 +185,7 @@ static int try_worker_shutdown(struct btrfs_worker_thread *worker) int freeit = 0; spin_lock_irq(&worker->lock); - spin_lock_irq(&worker->workers->lock); + spin_lock(&worker->workers->lock); if (worker->workers->num_workers > 1 && worker->idle && !worker->working && @@ -196,7 +196,7 @@ static int try_worker_shutdown(struct btrfs_worker_thread *worker) list_del_init(&worker->worker_list); worker->workers->num_workers--; } - spin_unlock_irq(&worker->workers->lock); + spin_unlock(&worker->workers->lock); spin_unlock_irq(&worker->lock); if (freeit)