Use the DEADLOCK_AVOIDANCE() macro instead.

(issue ASTERISK-19854)

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@367980 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/sig_pri.c b/channels/sig_pri.c
index c40ac495ebaf4d0e71a58761962b700daf68a91e..8f36a48376b23aea21fe12b2ba523b216b63dfee 100644 (file)
--- a/channels/sig_pri.c
+++ b/channels/sig_pri.c
@@ -1190,9 +1190,7 @@ static void sig_pri_lock_owner(struct sig_pri_span *pri, int chanpos)
 
                /* Avoid deadlock */
                sig_pri_unlock_private(pri->pvts[chanpos]);
-               ast_mutex_unlock(&pri->lock);
-               sched_yield();
-               ast_mutex_lock(&pri->lock);
+               DEADLOCK_AVOIDANCE(&pri->lock);
                sig_pri_lock_private(pri->pvts[chanpos]);
        }
 }

diff --git a/channels/sig_ss7.c b/channels/sig_ss7.c
index b0f884e9d1592493e8a26f15806b23f5b55b13cc..e442007539158312e8535535c877fd9d0dbd7fc5 100644 (file)
--- a/channels/sig_ss7.c
+++ b/channels/sig_ss7.c
@@ -300,9 +300,7 @@ static void sig_ss7_lock_owner(struct sig_ss7_linkset *ss7, int chanpos)
 
                /* Avoid deadlock */
                sig_ss7_unlock_private(ss7->pvts[chanpos]);
-               ast_mutex_unlock(&ss7->lock);
-               sched_yield();
-               ast_mutex_lock(&ss7->lock);
+               DEADLOCK_AVOIDANCE(&ss7->lock);
                sig_ss7_lock_private(ss7->pvts[chanpos]);
        }
 }