diff options
author | Jeff Mahoney <jeffm@suse.com> | 2016-12-20 13:28:28 -0500 |
---|---|---|
committer | David Sterba <dsterba@suse.com> | 2017-01-03 09:14:21 -0500 |
commit | d0280996437081dd12ed1e982ac8aeaa62835ec4 (patch) | |
tree | 9c1e103ecde5541b14903fa7f08630c5ebda84e6 /fs/btrfs/extent-tree.c | |
parent | aa7c8da35d1905d80e840d075f07d26ec90144b5 (diff) |
btrfs: fix locking when we put back a delayed ref that's too new
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>
Diffstat (limited to 'fs/btrfs/extent-tree.c')
-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 5366e50c84c6..ac7e6713033c 100644 --- a/fs/btrfs/extent-tree.c +++ b/fs/btrfs/extent-tree.c | |||
@@ -2522,11 +2522,11 @@ static noinline int __btrfs_run_delayed_refs(struct btrfs_trans_handle *trans, | |||
2522 | if (ref && ref->seq && | 2522 | if (ref && ref->seq && |
2523 | btrfs_check_delayed_seq(fs_info, delayed_refs, ref->seq)) { | 2523 | btrfs_check_delayed_seq(fs_info, delayed_refs, ref->seq)) { |
2524 | spin_unlock(&locked_ref->lock); | 2524 | spin_unlock(&locked_ref->lock); |
2525 | btrfs_delayed_ref_unlock(locked_ref); | ||
2526 | spin_lock(&delayed_refs->lock); | 2525 | spin_lock(&delayed_refs->lock); |
2527 | locked_ref->processing = 0; | 2526 | locked_ref->processing = 0; |
2528 | delayed_refs->num_heads_ready++; | 2527 | delayed_refs->num_heads_ready++; |
2529 | spin_unlock(&delayed_refs->lock); | 2528 | spin_unlock(&delayed_refs->lock); |
2529 | btrfs_delayed_ref_unlock(locked_ref); | ||
2530 | locked_ref = NULL; | 2530 | locked_ref = NULL; |
2531 | cond_resched(); | 2531 | cond_resched(); |
2532 | count++; | 2532 | count++; |