Browse Source

Btrfs: fix worker thread double spin_lock_irq

The exit-on-idle code for async worker threads was incorrectly
calling spin_lock_irq with interrupts already off.

Signed-off-by: Chris Mason <chris.mason@oracle.com>
Chris Mason 15 years ago
parent
commit
627e421a3f
1 changed files with 2 additions and 2 deletions
  1. 2 2
      fs/btrfs/async-thread.c

+ 2 - 2
fs/btrfs/async-thread.c

@@ -185,7 +185,7 @@ static int try_worker_shutdown(struct btrfs_worker_thread *worker)
 	int freeit = 0;
 	int freeit = 0;
 
 
 	spin_lock_irq(&worker->lock);
 	spin_lock_irq(&worker->lock);
-	spin_lock_irq(&worker->workers->lock);
+	spin_lock(&worker->workers->lock);
 	if (worker->workers->num_workers > 1 &&
 	if (worker->workers->num_workers > 1 &&
 	    worker->idle &&
 	    worker->idle &&
 	    !worker->working &&
 	    !worker->working &&
@@ -196,7 +196,7 @@ static int try_worker_shutdown(struct btrfs_worker_thread *worker)
 		list_del_init(&worker->worker_list);
 		list_del_init(&worker->worker_list);
 		worker->workers->num_workers--;
 		worker->workers->num_workers--;
 	}
 	}
-	spin_unlock_irq(&worker->workers->lock);
+	spin_unlock(&worker->workers->lock);
 	spin_unlock_irq(&worker->lock);
 	spin_unlock_irq(&worker->lock);
 
 
 	if (freeit)
 	if (freeit)