lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Btrfs: fix worker lock misuse in find_worker

Browse Source 
Dan Carpenter noticed that we were doing a double unlock on the worker
lock, and sometimes picking a worker thread without the lock held.

This fixes both errors.

Signed-off-by: Chris Mason <chris.mason@oracle.com>
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
This commit is contained in:
Chris Mason
2011-12-23 07:53:00 -05:00
parent d85c8a6f1b
commit 8d532b2afb
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
fs/btrfs/async-thread.c
View File

@@ -563,8 +563,8 @@ static struct btrfs_worker_thread *find_worker(struct btrfs_workers *workers)
struct list_head *fallback; struct list_head *fallback;
int ret; int ret;
again:
spin_lock_irqsave(&workers->lock, flags); spin_lock_irqsave(&workers->lock, flags);
again:
worker = next_worker(workers); worker = next_worker(workers);
if (!worker) { if (!worker) {
@@ -579,6 +579,7 @@ again:
spin_unlock_irqrestore(&workers->lock, flags); spin_unlock_irqrestore(&workers->lock, flags);
/* we're below the limit, start another worker */ /* we're below the limit, start another worker */
ret = __btrfs_start_workers(workers); ret = __btrfs_start_workers(workers);
spin_lock_irqsave(&workers->lock, flags);
if (ret) if (ret)
goto fallback; goto fallback;
goto again; goto again;