Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d13603ef authored by Arne Jansen's avatar Arne Jansen Committed by Jan Schmidt
Browse files

Btrfs: check the root passed to btrfs_end_transaction 



This patch only add a consistancy check to validate that the
same root is passed to start_transaction and end_transaction.
Subvolume quota depends on this.

Signed-off-by: default avatarArne Jansen <sensille@gmx.net>
parent 2f38b3e1

fs/btrfs/transaction.c

+6 −0
Original line number Diff line number Diff line
@@ -345,6 +345,7 @@ again: 
	h->transaction = cur_trans;

	h->blocks_used = 0;

	h->bytes_reserved = 0;

	h->root = root;

	h->delayed_ref_updates = 0;

	h->use_count = 1;

	h->block_rsv = NULL;
@@ -511,6 +512,11 @@ static int __btrfs_end_transaction(struct btrfs_trans_handle *trans, 


	btrfs_trans_release_metadata(trans, root);

	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);

	while (count < 2) {

		unsigned long cur = trans->delayed_ref_updates;

		trans->delayed_ref_updates = 0;

fs/btrfs/transaction.h

+6 −0
Original line number Diff line number Diff line
@@ -57,6 +57,12 @@ struct btrfs_trans_handle { 
	struct btrfs_block_rsv *block_rsv;

	struct btrfs_block_rsv *orig_rsv;

	int aborted;

	/*

	 * this root is only needed to validate that the root passed to

	 * start_transaction is the same as the one passed to end_transaction.

	 * Subvolume quota depends on this

	 */

	struct btrfs_root *root;

};



struct btrfs_pending_snapshot {