btrfs: Add assert to catch nested transaction commit
PATCH 1/1 btrfs: Add assert to catch nested transaction commit
A recent patch to btrfs showed that there was at least 1 case where a nesed transaction was committed. Nested transaction in this case means a code which has a transaction handle calls some function which in turn obtains a copy of the same transaction handle. In such cases the correct thing to do is for the lower callee to call btrfs_end_transaction which contains appropriate checks so as to not commit the transaction which will result in stale trans handler for the caller.
To catch such cases add an assert in btrfs_commit_transaction ensuring btrfs_trans_handle::use_count is always 1.
---
A full xfs test run didn't trigger this assert.
fs/btrfs/transaction.c | 2 ++ 1 file changed, 2 insertions(+)
fs/btrfs/transaction.c +2 -0
@@ -1949,6 +1949,8 @@ int btrfs_commit_transaction(struct btrfs_trans_handle *trans)struct btrfs_transaction *prev_trans =NULL ;int ret; +ASSERT (refcount_read (&trans->use_count) ==1 ); +/* Stop the commit early if ->aborted is set */ if (unlikely (READ_ONCE (cur_trans->aborted))) { ret = cur_trans->aborted;
Signature · 1 line
2.17.1
Quoted 8 lines · Nikolay Borisov
A recent patch to btrfs showed that there was at least 1 case where a nesed transaction was committed. Nested transaction in this case means a code which has a transaction handle calls some function which in turn obtains a copy of the same transaction handle. In such cases the correct thing to do is for the lower callee to call
btrfs_end_transactionwhich contains appropriate checks so as to not commit the transaction which will result in stale trans handler for the caller.
Quoted 4 lines
To catch such cases add an assert in
btrfs_commit_transactionensuringbtrfs_trans_handle::use_countis always 1.Signed-off-by Nikolay Borisov <[email protected]>
Thanks,
Josef
Quoted 8 lines · Nikolay Borisov
A recent patch to btrfs showed that there was at least 1 case where a nesed transaction was committed. Nested transaction in this case means a code which has a transaction handle calls some function which in turn obtains a copy of the same transaction handle. In such cases the correct thing to do is for the lower callee to call
btrfs_end_transactionwhich contains appropriate checks so as to not commit the transaction which will result in stale trans handler for the caller.
Quoted 4 lines
To catch such cases add an assert in
btrfs_commit_transactionensuringbtrfs_trans_handle::use_countis always 1.Signed-off-by Nikolay Borisov <[email protected]>
Added to misc-next, thanks.