From owner-svn-src-projects@FreeBSD.ORG  Wed Sep  1 19:27:42 2010
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 536291065673;
	Wed,  1 Sep 2010 19:27:42 +0000 (UTC)
	(envelope-from attilio@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 435BB8FC14;
	Wed,  1 Sep 2010 19:27:42 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o81JRglj077718;
	Wed, 1 Sep 2010 19:27:42 GMT (envelope-from attilio@svn.freebsd.org)
Received: (from attilio@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o81JRg33077716;
	Wed, 1 Sep 2010 19:27:42 GMT (envelope-from attilio@svn.freebsd.org)
Message-Id: <201009011927.o81JRg33077716@svn.freebsd.org>
From: Attilio Rao <attilio@FreeBSD.org>
Date: Wed, 1 Sep 2010 19:27:42 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r212108 - projects/sv/sys/net
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 01 Sep 2010 19:27:42 -0000

Author: attilio
Date: Wed Sep  1 19:27:41 2010
New Revision: 212108
URL: http://svn.freebsd.org/changeset/base/212108

Log:
  As announced earlier, just lock in non-panicking conditions.
  The code could be different and require any implementation of
  acquire_lock and release_lock virtual functions to skip in panicstr != NULL
  case, but that would be too error prone, so just handle locally.

Modified:
  projects/sv/sys/net/netdump_client.c

Modified: projects/sv/sys/net/netdump_client.c
==============================================================================
--- projects/sv/sys/net/netdump_client.c	Wed Sep  1 19:23:49 2010	(r212107)
+++ projects/sv/sys/net/netdump_client.c	Wed Sep  1 19:27:41 2010	(r212108)
@@ -1186,7 +1186,8 @@ netdump_trigger(void *arg, int howto)
 	savectx(&dumppcb);
 	dumping++;
 
-	nd_nic->if_netdump->acquire_lock(nd_nic);
+	if (panicstr == NULL)
+		nd_nic->if_netdump->acquire_lock(nd_nic);
 
 	/* Make the card use *our* receive callback */
 	old_if_input = nd_nic->if_input;
@@ -1242,7 +1243,8 @@ netdump_trigger(void *arg, int howto)
 trig_abort:
 	if (old_if_input)
 		nd_nic->if_input = old_if_input;
-	nd_nic->if_netdump->release_lock(nd_nic);
+	if (panicstr == NULL)
+		nd_nic->if_netdump->release_lock(nd_nic);
 	dumping--;
 }