Commit ae5d29d4 authored by David Sterba's avatar David Sterba
Browse files

btrfs: inline wait_current_trans_commit_start in its caller 



Function wait_current_trans_commit_start is now fairly trivial so it can
be inlined in its only caller.

Reviewed-by: default avatarAnand Jain <anand.jain@oracle.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 32cc4f87

fs/btrfs/transaction.c

+7 −13
Original line number Original line Diff line number Diff line
@@ -1870,18 +1870,6 @@ int btrfs_transaction_blocked(struct btrfs_fs_info *info) 
	return ret;

	return ret;

}

}





/*

 * wait for the current transaction commit to start and block subsequent

 * transaction joins

 */

static void wait_current_trans_commit_start(struct btrfs_fs_info *fs_info,

					    struct btrfs_transaction *trans)

{

	wait_event(fs_info->transaction_blocked_wait,

		   trans->state >= TRANS_STATE_COMMIT_START ||

		   TRANS_ABORTED(trans));

}



/*

/*

 * commit transactions asynchronously. once btrfs_commit_transaction_async

 * commit transactions asynchronously. once btrfs_commit_transaction_async

 * returns, any subsequent transaction will not be allowed to join.

 * returns, any subsequent transaction will not be allowed to join.
@@ -1941,7 +1929,13 @@ int btrfs_commit_transaction_async(struct btrfs_trans_handle *trans) 
		__sb_writers_release(fs_info->sb, SB_FREEZE_FS);

		__sb_writers_release(fs_info->sb, SB_FREEZE_FS);





	schedule_work(&ac->work);

	schedule_work(&ac->work);

	wait_current_trans_commit_start(fs_info, cur_trans);

	/*

	 * Wait for the current transaction commit to start and block

	 * subsequent transaction joins

	 */

	wait_event(fs_info->transaction_blocked_wait,

		   cur_trans->state >= TRANS_STATE_COMMIT_START ||

		   TRANS_ABORTED(cur_trans));

	if (current->journal_info == trans)

	if (current->journal_info == trans)

		current->journal_info = NULL;

		current->journal_info = NULL;