Commit 3e174099 authored by Josef Bacik's avatar Josef Bacik Committed by David Sterba

btrfs: record all roots for rename exchange on a subvol

Testing with the new fsstress support for subvolumes uncovered a pretty
bad problem with rename exchange on subvolumes.  We're modifying two
different subvolumes, but we only start the transaction on one of them,
so the other one is not added to the dirty root list.  This is caught by
btrfs_cow_block() with a warning because the root has not been updated,
however if we do not modify this root again we'll end up pointing at an
invalid root because the root item is never updated.

Fix this by making sure we add the destination root to the trans list,
the same as we do with normal renames.  This fixes the corruption.

Fixes: cdd1fedf ("btrfs: add support for RENAME_EXCHANGE and RENAME_WHITEOUT")
CC: stable@vger.kernel.org # 4.9+
Reviewed-by: default avatarFilipe Manana <fdmanana@suse.com>
Signed-off-by: default avatarJosef Bacik <josef@toxicpanda.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 042528f8
...@@ -9582,6 +9582,9 @@ static int btrfs_rename_exchange(struct inode *old_dir, ...@@ -9582,6 +9582,9 @@ static int btrfs_rename_exchange(struct inode *old_dir,
goto out_notrans; goto out_notrans;
} }
if (dest != root)
btrfs_record_root_in_trans(trans, dest);
/* /*
* We need to find a free sequence number both in the source and * We need to find a free sequence number both in the source and
* in the destination directory for the exchange. * in the destination directory for the exchange.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment