diff options
| author | Julia Lawall <julia@diku.dk> | 2009-07-22 22:49:00 +0200 |
|---|---|---|
| committer | Chris Mason <chris.mason@oracle.com> | 2009-07-22 22:49:00 +0200 |
| commit | 29c5e8ce01f9dad7e24b99c21e4f836d6b0289e0 (patch) | |
| tree | ca5628ea861a4fdb875e6cc90878853ad74091f2 | |
| parent | Btrfs: make sure all dirty blocks are written at commit time (diff) | |
| download | linux-29c5e8ce01f9dad7e24b99c21e4f836d6b0289e0.tar.xz linux-29c5e8ce01f9dad7e24b99c21e4f836d6b0289e0.zip | |
Btrfs: convert nested spin_lock_irqsave to spin_lock
If spin_lock_irqsave is called twice in a row with the same second
argument, the interrupt state at the point of the second call overwrites
the value saved by the first call. Indeed, the second call does not need
to save the interrupt state, so it is changed to a simple spin_lock.
Signed-off-by: Julia Lawall <julia@diku.dk>
Signed-off-by: Chris Mason <chris.mason@oracle.com>
| -rw-r--r-- | fs/btrfs/async-thread.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/btrfs/async-thread.c b/fs/btrfs/async-thread.c index 6e4f6c50a120..019e8af449ab 100644 --- a/fs/btrfs/async-thread.c +++ b/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; |