From b37b39cd6b8af7a7c39fc7340d71f3db492af9e2 Mon Sep 17 00:00:00 2001 From: Josef Bacik Date: Tue, 23 Jul 2013 16:57:15 -0400 Subject: [PATCH] Btrfs: cleanup reloc roots properly on error I was hitting the BUG_ON() at the end of merge_reloc_roots() because we were aborting the transaction at some point previously and then getting an error when we tried to drop the reloc root. I fixed btrfs_drop_snapshot to re-add us to the dead roots list if we failed, but this isn't the right thing to do for reloc roots since it uses root->root_list for it's own stuff in order to know what needs to be cleaned up. So fix btrfs_drop_snapshot to only do the re-add if we aren't dropping for reloc, and handle errors from merge_reloc_root() by dropping the reloc root we are processing since it won't be on the list of roots to cleanup. With this patch my reproducer no longer panics. Thanks, Signed-off-by: Josef Bacik Signed-off-by: Chris Mason --- Reading git-format-patch failed