Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Btrfs: check the root passed to btrfs_end_transaction

Browse source 
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: Arne Jansen <sensille@gmx.net>
This commit is contained in:
Arne Jansen 2011-09-13 11:40:09 +02:00 • committed by Jan Schmidt
parent 2f38b3e190
commit d13603ef6e
2 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
fs/btrfs/transaction.c
View file

@ -345,6 +345,7 @@ static struct btrfs_trans_handle *start_transaction(struct btrfs_root *root,
h->transaction = cur_trans; h->transaction = cur_trans;
h->blocks_used = 0; h->blocks_used = 0;
h->bytes_reserved = 0; h->bytes_reserved = 0;
h->root = root;
h->delayed_ref_updates = 0; h->delayed_ref_updates = 0;
h->use_count = 1; h->use_count = 1;
h->block_rsv = NULL; h->block_rsv = NULL;
@ -511,6 +512,11 @@ 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);
while (count < 2) { while (count < 2) {
unsigned long cur = trans->delayed_ref_updates; unsigned long cur = trans->delayed_ref_updates;
trans->delayed_ref_updates = 0; trans->delayed_ref_updates = 0;

6
fs/btrfs/transaction.h
View file

@ -57,6 +57,12 @@ struct btrfs_trans_handle {
struct btrfs_block_rsv *block_rsv; struct btrfs_block_rsv *block_rsv;
struct btrfs_block_rsv *orig_rsv; struct btrfs_block_rsv *orig_rsv;
int aborted; 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 { struct btrfs_pending_snapshot {