diff options
| author | Jeff Mahoney <jeffm@suse.com> | 2016-12-20 13:28:28 -0500 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2017-03-16 02:26:44 +0000 |
| commit | e0c69a791b5f3f7c2ea451fb3fba794a880e8e80 (patch) | |
| tree | 67ec3fdde4854c6b89c1e5799c5e4fe41f4301c1 /fs | |
| parent | 884285c06ee71d122aa49309bfca71b70ff19ea3 (diff) | |
| download | linux-stable-e0c69a791b5f3f7c2ea451fb3fba794a880e8e80.tar.gz linux-stable-e0c69a791b5f3f7c2ea451fb3fba794a880e8e80.tar.bz2 linux-stable-e0c69a791b5f3f7c2ea451fb3fba794a880e8e80.zip | |
btrfs: fix locking when we put back a delayed ref that's too new
commit d0280996437081dd12ed1e982ac8aeaa62835ec4 upstream.
In __btrfs_run_delayed_refs, when we put back a delayed ref that's too
new, we have already dropped the lock on locked_ref when we set
->processing = 0.
This patch keeps the lock to cover that assignment.
Fixes: d7df2c796d7 (Btrfs: attach delayed ref updates to delayed ref heads)
Signed-off-by: Jeff Mahoney <jeffm@suse.com>
Reviewed-by: Liu Bo <bo.li.liu@oracle.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/btrfs/extent-tree.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c index f3f8706e5748..fd518dffe6d3 100644 --- a/fs/btrfs/extent-tree.c +++ b/fs/btrfs/extent-tree.c @@ -2429,11 +2429,11 @@ static noinline int __btrfs_run_delayed_refs(struct btrfs_trans_handle *trans, if (ref && ref->seq && btrfs_check_delayed_seq(fs_info, delayed_refs, ref->seq)) { spin_unlock(&locked_ref->lock); - btrfs_delayed_ref_unlock(locked_ref); spin_lock(&delayed_refs->lock); locked_ref->processing = 0; delayed_refs->num_heads_ready++; spin_unlock(&delayed_refs->lock); + btrfs_delayed_ref_unlock(locked_ref); locked_ref = NULL; cond_resched(); count++; |