diff options
author | Jeff Mahoney <jeffm@suse.com> | 2016-12-20 13:28:28 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-01-19 14:18:05 -0500 |
commit | 003e3163fcc76bfdf27c27ef4f5c776bfa925067 (patch) | |
tree | 38ca2a0c0f9f205d07674298bde4e5771323baeb /fs | |
parent | 0aefd99f37f315a67dcb6487ce371f32dd1422a7 (diff) |
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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
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 4607af38c72e..265d44127b1e 100644 --- a/fs/btrfs/extent-tree.c +++ b/fs/btrfs/extent-tree.c | |||
@@ -2537,11 +2537,11 @@ static noinline int __btrfs_run_delayed_refs(struct btrfs_trans_handle *trans, | |||
2537 | if (ref && ref->seq && | 2537 | if (ref && ref->seq && |
2538 | btrfs_check_delayed_seq(fs_info, delayed_refs, ref->seq)) { | 2538 | btrfs_check_delayed_seq(fs_info, delayed_refs, ref->seq)) { |
2539 | spin_unlock(&locked_ref->lock); | 2539 | spin_unlock(&locked_ref->lock); |
2540 | btrfs_delayed_ref_unlock(locked_ref); | ||
2541 | spin_lock(&delayed_refs->lock); | 2540 | spin_lock(&delayed_refs->lock); |
2542 | locked_ref->processing = 0; | 2541 | locked_ref->processing = 0; |
2543 | delayed_refs->num_heads_ready++; | 2542 | delayed_refs->num_heads_ready++; |
2544 | spin_unlock(&delayed_refs->lock); | 2543 | spin_unlock(&delayed_refs->lock); |
2544 | btrfs_delayed_ref_unlock(locked_ref); | ||
2545 | locked_ref = NULL; | 2545 | locked_ref = NULL; |
2546 | cond_resched(); | 2546 | cond_resched(); |
2547 | count++; | 2547 | count++; |