svn commit: r219664 - stable/8/sys/kern

[Konstantin Belousov]

Author: kib
Date: Tue Mar 15 10:17:18 2011
New Revision: 219664
URL: http://svn.freebsd.org/changeset/base/219664

Log:
  MFC r219396:
  Do not assert buffer lock in VFS_STRATEGY() when kernel already paniced.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  stable/8/sys/kern/vfs_subr.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)

Modified: stable/8/sys/kern/vfs_subr.c
==============================================================================
--- stable/8/sys/kern/vfs_subr.c	Tue Mar 15 10:13:35 2011	(r219663)
+++ stable/8/sys/kern/vfs_subr.c	Tue Mar 15 10:17:18 2011	(r219664)
@@ -3863,7 +3863,7 @@ vop_strategy_pre(void *ap)
 	if ((bp->b_flags & B_CLUSTER) != 0)
 		return;
 
-	if (!BUF_ISLOCKED(bp)) {
+	if (panicstr == NULL && !BUF_ISLOCKED(bp)) {
 		if (vfs_badlock_print)
 			printf(
 			    "VOP_STRATEGY: bp is not locked but should be\n");