|
@@ -683,7 +683,8 @@ static int __btrfs_end_transaction(struct btrfs_trans_handle *trans,
|
|
int lock = (trans->type != TRANS_JOIN_NOLOCK);
|
|
int lock = (trans->type != TRANS_JOIN_NOLOCK);
|
|
int err = 0;
|
|
int err = 0;
|
|
|
|
|
|
- if (--trans->use_count) {
|
|
|
|
|
|
+ if (trans->use_count > 1) {
|
|
|
|
+ trans->use_count--;
|
|
trans->block_rsv = trans->orig_rsv;
|
|
trans->block_rsv = trans->orig_rsv;
|
|
return 0;
|
|
return 0;
|
|
}
|
|
}
|
|
@@ -731,17 +732,10 @@ static int __btrfs_end_transaction(struct btrfs_trans_handle *trans,
|
|
}
|
|
}
|
|
|
|
|
|
if (lock && ACCESS_ONCE(cur_trans->state) == TRANS_STATE_BLOCKED) {
|
|
if (lock && ACCESS_ONCE(cur_trans->state) == TRANS_STATE_BLOCKED) {
|
|
- if (throttle) {
|
|
|
|
- /*
|
|
|
|
- * We may race with somebody else here so end up having
|
|
|
|
- * to call end_transaction on ourselves again, so inc
|
|
|
|
- * our use_count.
|
|
|
|
- */
|
|
|
|
- trans->use_count++;
|
|
|
|
|
|
+ if (throttle)
|
|
return btrfs_commit_transaction(trans, root);
|
|
return btrfs_commit_transaction(trans, root);
|
|
- } else {
|
|
|
|
|
|
+ else
|
|
wake_up_process(info->transaction_kthread);
|
|
wake_up_process(info->transaction_kthread);
|
|
- }
|
|
|
|
}
|
|
}
|
|
|
|
|
|
if (trans->type & __TRANS_FREEZABLE)
|
|
if (trans->type & __TRANS_FREEZABLE)
|