Use ast_channel_lock_both() where it was inlined before.
authorRichard Mudgett <rmudgett@digium.com>
Fri, 20 Apr 2012 16:23:01 +0000 (16:23 +0000)
committerRichard Mudgett <rmudgett@digium.com>
Fri, 20 Apr 2012 16:23:01 +0000 (16:23 +0000)
commit01194c581139eb19063700418ce2a1df0c69ef02
tree744a7cd232b059dc39bfca4c41469e27aba91e66
parentb43f4a60ddf00ca242d95488bc31fd8ea7fc5b9f
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
apps/app_dial.c
channels/chan_dahdi.c
channels/chan_local.c
channels/chan_misdn.c
main/rtp_engine.c