Commit 8d532b2a authored by Chris Mason's avatar Chris Mason

Btrfs: fix worker lock misuse in find_worker

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: default avatarChris Mason <chris.mason@oracle.com>
Reported-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
parent d85c8a6f
...@@ -563,8 +563,8 @@ static struct btrfs_worker_thread *find_worker(struct btrfs_workers *workers) ...@@ -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 @@ static struct btrfs_worker_thread *find_worker(struct btrfs_workers *workers) ...@@ -579,6 +579,7 @@ static struct btrfs_worker_thread *find_worker(struct btrfs_workers *workers)
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;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment