From: Josef Bacik Date: Fri, 7 Mar 2014 00:01:07 +0000 (-0500) Subject: Btrfs: fix deadlock with nested trans handles X-Git-Tag: v3.15-rc1~96^2~12 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3bbb24b20a8800158c33eca8564f432dd14d0bf3;p=pandora-kernel.git Btrfs: fix deadlock with nested trans handles Zach found this deadlock that would happen like this btrfs_end_transaction <- reduce trans->use_count to 0 btrfs_run_delayed_refs btrfs_cow_block find_free_extent btrfs_start_transaction <- increase trans->use_count to 1 allocate chunk btrfs_end_transaction <- decrease trans->use_count to 0 btrfs_run_delayed_refs lock tree block we are cowing above ^^ We need to only decrease trans->use_count if it is above 1, otherwise leave it alone. This will make nested trans be the only ones who decrease their added ref, and will let us get rid of the trans->use_count++ hack if we have to commit the transaction. Thanks, cc: stable@vger.kernel.org Reported-by: Zach Brown Signed-off-by: Josef Bacik Tested-by: Zach Brown Signed-off-by: Chris Mason --- Reading git-diff-tree failed