|
@@ -626,14 +626,13 @@ static int __btrfs_end_transaction(struct btrfs_trans_handle *trans,
|
|
|
|
|
|
btrfs_trans_release_metadata(trans, root);
|
|
btrfs_trans_release_metadata(trans, root);
|
|
trans->block_rsv = NULL;
|
|
trans->block_rsv = NULL;
|
|
- /*
|
|
|
|
- * the same root has to be passed to start_transaction and
|
|
|
|
- * end_transaction. Subvolume quota depends on this.
|
|
|
|
- */
|
|
|
|
- WARN_ON(trans->root != root);
|
|
|
|
|
|
|
|
if (trans->qgroup_reserved) {
|
|
if (trans->qgroup_reserved) {
|
|
- btrfs_qgroup_free(root, trans->qgroup_reserved);
|
|
|
|
|
|
+ /*
|
|
|
|
+ * the same root has to be passed here between start_transaction
|
|
|
|
+ * and end_transaction. Subvolume quota depends on this.
|
|
|
|
+ */
|
|
|
|
+ btrfs_qgroup_free(trans->root, trans->qgroup_reserved);
|
|
trans->qgroup_reserved = 0;
|
|
trans->qgroup_reserved = 0;
|
|
}
|
|
}
|
|
|
|
|