[asterisk-commits] irroot: branch irroot/distrotech-customers-trunk r323100 - /team/irroot/distr...

[SVN commits to the Asterisk project]

Author: irroot
Date: Sat Jun 11 11:44:41 2011
New Revision: 323100

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=323100
Log:
Remove deadlock avoidance for pickup

Modified:
    team/irroot/distrotech-customers-trunk/main/channel.c

Modified: team/irroot/distrotech-customers-trunk/main/channel.c
URL: http://svnview.digium.com/svn/asterisk/team/irroot/distrotech-customers-trunk/main/channel.c?view=diff&rev=323100&r1=323099&r2=323100
==============================================================================
--- team/irroot/distrotech-customers-trunk/main/channel.c (original)
+++ team/irroot/distrotech-customers-trunk/main/channel.c Sat Jun 11 11:44:41 2011
@@ -6501,12 +6501,8 @@
 	 */
 	ao2_lock(channels);
 
-	/* lock the original channel with deadlock avoidance to determine if the masquerade is require or not */
-	while (ast_channel_trylock(original)) {
-		ao2_unlock(channels);
-		usleep(1);
-		ao2_lock(channels);
-	}
+	/* lock the original channel to determine if the masquerade is require or not */
+	ast_channel_lock(original);
 
 	/* This checks to see if the masquerade has already happened or not.  There is a
 	 * race condition that exists for this function. Since all pvt and channel locks