|
@@ -3589,16 +3589,13 @@ void btrfs_cleanup_one_transaction(struct btrfs_transaction *cur_trans,
|
|
/* FIXME: cleanup wait for commit */
|
|
/* FIXME: cleanup wait for commit */
|
|
cur_trans->in_commit = 1;
|
|
cur_trans->in_commit = 1;
|
|
cur_trans->blocked = 1;
|
|
cur_trans->blocked = 1;
|
|
- if (waitqueue_active(&root->fs_info->transaction_blocked_wait))
|
|
|
|
- wake_up(&root->fs_info->transaction_blocked_wait);
|
|
|
|
|
|
+ wake_up(&root->fs_info->transaction_blocked_wait);
|
|
|
|
|
|
cur_trans->blocked = 0;
|
|
cur_trans->blocked = 0;
|
|
- if (waitqueue_active(&root->fs_info->transaction_wait))
|
|
|
|
- wake_up(&root->fs_info->transaction_wait);
|
|
|
|
|
|
+ wake_up(&root->fs_info->transaction_wait);
|
|
|
|
|
|
cur_trans->commit_done = 1;
|
|
cur_trans->commit_done = 1;
|
|
- if (waitqueue_active(&cur_trans->commit_wait))
|
|
|
|
- wake_up(&cur_trans->commit_wait);
|
|
|
|
|
|
+ wake_up(&cur_trans->commit_wait);
|
|
|
|
|
|
btrfs_destroy_pending_snapshots(cur_trans);
|
|
btrfs_destroy_pending_snapshots(cur_trans);
|
|
|
|
|