From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Message-Id: <20130911042908.283625793@goodmis.org> Date: Wed, 11 Sep 2013 00:28:43 -0400 From: Steven Rostedt To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Alex Lyakas , Josef Bacik Subject: [096/251] Btrfs: fix lock leak when resuming snapshot deletion References: <20130911042707.738353451@goodmis.org> Content-Disposition: inline; filename=0096-Btrfs-fix-lock-leak-when-resuming-snapshot-deletion.patch Sender: linux-kernel-owner@vger.kernel.org List-ID: 3.6.11.9-rc1 stable review patch. If anyone has any objections, please let me know. ------------------ From: Josef Bacik [ Upstream commit fec386ac1428f9c0e672df952cbca5cebd4e4e2f ] 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 Signed-off-by: Josef Bacik Signed-off-by: Steven Rostedt --- fs/btrfs/extent-tree.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c index 6d7b589..dcfce2a 100644 --- a/fs/btrfs/extent-tree.c +++ b/fs/btrfs/extent-tree.c @@ -7007,6 +7007,7 @@ int btrfs_drop_snapshot(struct btrfs_root *root, while (1) { btrfs_tree_lock(path->nodes[level]); btrfs_set_lock_blocking(path->nodes[level]); + path->locks[level] = BTRFS_WRITE_LOCK_BLOCKING; ret = btrfs_lookup_extent_info(trans, root, path->nodes[level]->start, @@ -7023,6 +7024,7 @@ int btrfs_drop_snapshot(struct btrfs_root *root, break; btrfs_tree_unlock(path->nodes[level]); + path->locks[level] = 0; WARN_ON(wc->refs[level] != 1); level--; } -- 1.7.10.4