diff options
| author | Qu Wenruo <wqu@suse.com> | 2017-12-19 15:44:54 +0800 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2018-03-31 01:26:51 +0200 |
| commit | 4d31778aa2fa342f5f92ca4025b293a1729161d1 (patch) | |
| tree | b155b504dd78259082db954b4436be35680c650b /fs/btrfs/transaction.c | |
| parent | 2e32ef87b074cb8098436634b649b4b2b523acbe (diff) | |
| download | linux-stable-4d31778aa2fa342f5f92ca4025b293a1729161d1.tar.gz linux-stable-4d31778aa2fa342f5f92ca4025b293a1729161d1.tar.bz2 linux-stable-4d31778aa2fa342f5f92ca4025b293a1729161d1.zip | |
btrfs: qgroup: Fix root item corruption when multiple same source snapshots are created with quota enabled
When multiple pending snapshots referring to the same source subvolume
are executed, enabled quota will cause root item corruption, where root
items are using old bytenr (no backref in extent tree).
This can be triggered by fstests btrfs/152.
The cause is when source subvolume is still dirty, extra commit
(simplied transaction commit) of qgroup_account_snapshot() can skip
dirty roots not recorded in current transaction, making root item of
source subvolume not updated.
Fix it by forcing recording source subvolume in current transaction
before qgroup sub-transaction commit.
Reported-by: Justin Maggard <jmaggard@netgear.com>
Signed-off-by: Qu Wenruo <wqu@suse.com>
Reviewed-by: Filipe Manana <fdmanana@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'fs/btrfs/transaction.c')
| -rw-r--r-- | fs/btrfs/transaction.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/fs/btrfs/transaction.c b/fs/btrfs/transaction.c index 665438542b96..17978fd731f6 100644 --- a/fs/btrfs/transaction.c +++ b/fs/btrfs/transaction.c @@ -319,7 +319,7 @@ static int record_root_in_trans(struct btrfs_trans_handle *trans, if ((test_bit(BTRFS_ROOT_REF_COWS, &root->state) && root->last_trans < trans->transid) || force) { WARN_ON(root == fs_info->extent_root); - WARN_ON(root->commit_root != root->node); + WARN_ON(!force && root->commit_root != root->node); /* * see below for IN_TRANS_SETUP usage rules @@ -1372,6 +1372,14 @@ static int qgroup_account_snapshot(struct btrfs_trans_handle *trans, return 0; /* + * Ensure dirty @src will be commited. Or, after comming + * commit_fs_roots() and switch_commit_roots(), any dirty but not + * recorded root will never be updated again, causing an outdated root + * item. + */ + record_root_in_trans(trans, src, 1); + + /* * We are going to commit transaction, see btrfs_commit_transaction() * comment for reason locking tree_log_mutex */ |