Commit e9fbcb42 authored by Chris Mason's avatar Chris Mason

Btrfs: call the ordered free operation without any locks held

Each ordered operation has a free callback, and this was called with the
worker spinlock held.  Josef made the free callback also call iput,
which we can't do with the spinlock.

This drops the spinlock for the free operation and grabs it again before
moving through the rest of the list.  We'll circle back around to this
and find a cleaner way that doesn't bounce the lock around so much.
Signed-off-by: default avatarChris Mason <chris.mason@fusionio.com>
cc: stable@kernel.org
parent 2b0ce2c2
...@@ -206,10 +206,17 @@ static noinline void run_ordered_completions(struct btrfs_workers *workers, ...@@ -206,10 +206,17 @@ static noinline void run_ordered_completions(struct btrfs_workers *workers,
work->ordered_func(work); work->ordered_func(work);
/* now take the lock again and call the freeing code */ /* now take the lock again and drop our item from the list */
spin_lock(&workers->order_lock); spin_lock(&workers->order_lock);
list_del(&work->order_list); list_del(&work->order_list);
spin_unlock(&workers->order_lock);
/*
* we don't want to call the ordered free functions
* with the lock held though
*/
work->ordered_free(work); work->ordered_free(work);
spin_lock(&workers->order_lock);
} }
spin_unlock(&workers->order_lock); spin_unlock(&workers->order_lock);
......
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