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

Commit 7c2ec3f0 authored by Liu Bo's avatar Liu Bo Committed by Chris Mason
Browse files

Btrfs: fix warning when creating snapshots 



Creating snapshot passes extent_root to commit its transaction,
but it can lead to the warning of checking root for quota in
the __btrfs_end_transaction() when someone else is committing
the current transaction.  Since we've recorded the needed root
in trans_handle, just use it to get rid of the warning.

Signed-off-by: default avatarLiu Bo <bo.li.liu@oracle.com>
Signed-off-by: default avatarChris Mason <chris.mason@fusionio.com>
parent 720f1e20

fs/btrfs/transaction.c

+5 −6
Original line number Original line Diff line number Diff line
@@ -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;

	}

	}