diff options
| author | Josef Bacik <josef@toxicpanda.com> | 2019-11-15 21:43:06 +0100 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2019-11-18 20:08:31 +0100 |
| commit | 3e1740993e43116b3bc71b0aad1e6872f6ccf341 (patch) | |
| tree | f14290e9dd2aef70f973b355c5d104213e517f2b /fs | |
| parent | Btrfs: fix block group remaining RO forever after error during device replace (diff) | |
| download | linux-3e1740993e43116b3bc71b0aad1e6872f6ccf341.tar.xz linux-3e1740993e43116b3bc71b0aad1e6872f6ccf341.zip | |
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: cdd1fedf8261 ("btrfs: add support for RENAME_EXCHANGE and RENAME_WHITEOUT")
CC: stable@vger.kernel.org # 4.9+
Reviewed-by: Filipe Manana <fdmanana@suse.com>
Signed-off-by: Josef Bacik <josef@toxicpanda.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/btrfs/inode.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index 6e9183f58722..b13c212b1bed 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -9582,6 +9582,9 @@ static int btrfs_rename_exchange(struct inode *old_dir, 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 * in the destination directory for the exchange. |