From owner-p4-projects@FreeBSD.ORG  Thu May  8 15:56:11 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 16EFB1065675; Thu,  8 May 2008 15:56:11 +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 CD5D9106566C
	for <perforce@freebsd.org>; Thu,  8 May 2008 15:56:10 +0000 (UTC)
	(envelope-from andre@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id BC56D8FC0C
	for <perforce@freebsd.org>; Thu,  8 May 2008 15:56:10 +0000 (UTC)
	(envelope-from andre@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 m48FuAll068384
	for <perforce@freebsd.org>; Thu, 8 May 2008 15:56:10 GMT
	(envelope-from andre@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m48FuAJk068382
	for perforce@freebsd.org; Thu, 8 May 2008 15:56:10 GMT
	(envelope-from andre@freebsd.org)
Date: Thu, 8 May 2008 15:56:10 GMT
Message-Id: <200805081556.m48FuAJk068382@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	andre@freebsd.org using -f
From: Andre Oppermann <andre@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 141327 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: Thu, 08 May 2008 15:56:11 -0000

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

Change 141327 by andre@andre_flirtbox on 2008/05/08 15:55:14

	Apply locking changes to new function.

Affected files ...

.. //depot/projects/tcp_reass/netinet/tcp_timer.c#4 edit

Differences ...

==== //depot/projects/tcp_reass/netinet/tcp_timer.c#4 (text+ko) ====

@@ -585,11 +585,11 @@
 		INP_INFO_RUNLOCK(&tcbinfo);
 		return;
 	}
-	INP_LOCK(inp);
+	INP_WLOCK(inp);
 	INP_INFO_RUNLOCK(&tcbinfo);
 	if ((inp->inp_vflag & INP_DROPPED) || callout_pending(&tp->t_timers->tt_reass)
 	    || !callout_active(&tp->t_timers->tt_reass)) {
-		INP_UNLOCK(inp);
+		INP_WUNLOCK(inp);
 		return;
 	}
 	callout_deactivate(&tp->t_timers->tt_reass);
@@ -598,7 +598,7 @@
 	tcp_reass_qfree(tp);
 	tp->t_flags |= TF_ACKNOW;
 	(void) tcp_output(tp);
-	INP_UNLOCK(inp);
+	INP_WUNLOCK(inp);
 }
 
 void