Commit fec386ac1428f9c0e672df952cbca5cebd4e4e2f
1 parent
3c8f242257
Exists in
master
and in
20 other branches
Btrfs: fix lock leak when resuming snapshot deletion
We aren't setting path->locks[level] when we resume a snapshot deletion which means we won't unlock the buffer when we free the path. This causes deadlocks if we happen to re-allocate the block before we've evicted the extent buffer from cache. Thanks, Cc: stable@vger.kernel.org Reported-by: Alex Lyakas <alex.btrfs@zadarastorage.com> Signed-off-by: Josef Bacik <jbacik@fusionio.com>
Showing 1 changed file with 2 additions and 0 deletions Side-by-side Diff
fs/btrfs/extent-tree.c
| ... | ... | @@ -7523,6 +7523,7 @@ |
| 7523 | 7523 | while (1) { |
| 7524 | 7524 | btrfs_tree_lock(path->nodes[level]); |
| 7525 | 7525 | btrfs_set_lock_blocking(path->nodes[level]); |
| 7526 | + path->locks[level] = BTRFS_WRITE_LOCK_BLOCKING; | |
| 7526 | 7527 | |
| 7527 | 7528 | ret = btrfs_lookup_extent_info(trans, root, |
| 7528 | 7529 | path->nodes[level]->start, |
| ... | ... | @@ -7538,6 +7539,7 @@ |
| 7538 | 7539 | break; |
| 7539 | 7540 | |
| 7540 | 7541 | btrfs_tree_unlock(path->nodes[level]); |
| 7542 | + path->locks[level] = 0; | |
| 7541 | 7543 | WARN_ON(wc->refs[level] != 1); |
| 7542 | 7544 | level--; |
| 7543 | 7545 | } |