From owner-p4-projects@FreeBSD.ORG  Wed Feb 27 22:35:29 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id F0B281065679; Wed, 27 Feb 2008 22:35:28 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id B2D6E1065677
	for <perforce@FreeBSD.org>; Wed, 27 Feb 2008 22:35:28 +0000 (UTC)
	(envelope-from swise@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id A01448FC1B
	for <perforce@FreeBSD.org>; Wed, 27 Feb 2008 22:35:28 +0000 (UTC)
	(envelope-from swise@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1RMZSGf033375
	for <perforce@FreeBSD.org>; Wed, 27 Feb 2008 22:35:28 GMT
	(envelope-from swise@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1RMZSTa033372
	for perforce@freebsd.org; Wed, 27 Feb 2008 22:35:28 GMT
	(envelope-from swise@FreeBSD.org)
Date: Wed, 27 Feb 2008 22:35:28 GMT
Message-Id: <200802272235.m1RMZSTa033372@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	swise@FreeBSD.org using -f
From: Steve Wise <swise@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 136373 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 27 Feb 2008 22:35:29 -0000

http://perforce.freebsd.org/chv.cgi?CH=136373

Change 136373 by swise@swise:vic10:iwarp on 2008/02/27 22:35:25

	Fixed recursive lock bugs.

Affected files ...

.. //depot/projects/iwarp/sys/contrib/rdma/krping/krping.c#10 edit
.. //depot/projects/iwarp/sys/contrib/rdma/rdma_iwcm.c#9 edit

Differences ...

==== //depot/projects/iwarp/sys/contrib/rdma/krping/krping.c#10 (text+ko) ====

@@ -308,12 +308,10 @@
 		  cb->remote_rkey, (unsigned long long)cb->remote_addr, 
 		  cb->remote_len);
 
-	mtx_lock_spin(&cb->lock);
 	if (cb->state <= CONNECTED || cb->state == RDMA_WRITE_COMPLETE)
 		cb->state = RDMA_READ_ADV;
 	else
 		cb->state = RDMA_WRITE_ADV;
-	mtx_unlock_spin(&cb->lock);
 
 	return 0;
 }
@@ -326,12 +324,10 @@
 		return -1;
 	}
 
-	mtx_lock_spin(&cb->lock);
 	if (cb->state == RDMA_READ_ADV)
 		cb->state = RDMA_WRITE_ADV;
 	else
 		cb->state = RDMA_WRITE_COMPLETE;
-	mtx_unlock_spin(&cb->lock);
 
 	return 0;
 }

==== //depot/projects/iwarp/sys/contrib/rdma/rdma_iwcm.c#9 (text+ko) ====

@@ -957,9 +957,7 @@
 		}
 	}
 
-	mtx_lock_spin(&cm_id_priv->lock);
 	atomic_inc(&cm_id_priv->refcount);
-	mtx_unlock_spin(&cm_id_priv->lock);
 	if (TAILQ_EMPTY(&cm_id_priv->work_list)) {
 		TAILQ_INSERT_TAIL(&cm_id_priv->work_list, work, list);
 		taskqueue_enqueue(iwcm_wq, &work->task);