[svn-commits] rmudgett: branch 13 r432574 - /branches/13/res/res_pjsip_refer.c

[SVN commits to the Digium repositories]

Author: rmudgett
Date: Fri Mar  6 16:12:32 2015
New Revision: 432574

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=432574
Log:
res_pjsip_refer: Made refer_attended_alloc() not create the ao2 object with a lock.

The lock is unused.

Modified:
    branches/13/res/res_pjsip_refer.c

Modified: branches/13/res/res_pjsip_refer.c
URL: http://svnview.digium.com/svn/asterisk/branches/13/res/res_pjsip_refer.c?view=diff&rev=432574&r1=432573&r2=432574
==============================================================================
--- branches/13/res/res_pjsip_refer.c (original)
+++ branches/13/res/res_pjsip_refer.c Fri Mar  6 16:12:32 2015
@@ -408,7 +408,7 @@
 	/*! \brief Transferer channel */
 	struct ast_channel *transferer_chan;
 	/*! \brief Second transferer session */
-	struct ast_sip_session *transferer_second	;
+	struct ast_sip_session *transferer_second;
 	/*! \brief Optional refer progress structure */
 	struct refer_progress *progress;
 };
@@ -425,11 +425,14 @@
 }
 
 /*! \brief Allocator for attended transfer task */
-static struct refer_attended *refer_attended_alloc(struct ast_sip_session *transferer, struct ast_sip_session *transferer_second,
+static struct refer_attended *refer_attended_alloc(struct ast_sip_session *transferer,
+	struct ast_sip_session *transferer_second,
 	struct refer_progress *progress)
 {
-	struct refer_attended *attended = ao2_alloc(sizeof(*attended), refer_attended_destroy);
-
+	struct refer_attended *attended;
+
+	attended = ao2_alloc_options(sizeof(*attended), refer_attended_destroy,
+		AO2_ALLOC_OPT_LOCK_NOLOCK);
 	if (!attended) {
 		return NULL;
 	}