diff options
| author | Richard Mudgett <rmudgett@digium.com> | 2012-04-20 16:23:01 +0000 |
|---|---|---|
| committer | Richard Mudgett <rmudgett@digium.com> | 2012-04-20 16:23:01 +0000 |
| commit | 01194c581139eb19063700418ce2a1df0c69ef02 (patch) | |
| tree | 744a7cd232b059dc39bfca4c41469e27aba91e66 /channels/chan_local.c | |
| parent | b43f4a60ddf00ca242d95488bc31fd8ea7fc5b9f (diff) | |
Use ast_channel_lock_both() where it was inlined before.
The CHANNEL_DEADLOCK_AVOIDANCE() feature of preserving where the channel
lock was originally obtained is overkill where ast_channel_lock_both() was
inlined.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@362888 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels/chan_local.c')
| -rw-r--r-- | channels/chan_local.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/channels/chan_local.c b/channels/chan_local.c index c0657c97b..069f44a2e 100644 --- a/channels/chan_local.c +++ b/channels/chan_local.c @@ -194,10 +194,7 @@ static void awesome_locking(struct local_pvt *p, struct ast_channel **outchan, s ao2_lock(p); } else { /* lock both channels first, then get the pvt lock */ - ast_channel_lock(chan); - while (ast_channel_trylock(owner)) { - CHANNEL_DEADLOCK_AVOIDANCE(chan); - } + ast_channel_lock_both(chan, owner); ao2_lock(p); } |