From owner-p4-projects  Thu Feb 27 13:17:51 2003
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 2FE6337B405; Thu, 27 Feb 2003 13:17:49 -0800 (PST)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id BD9B337B401
	for <perforce@freebsd.org>; Thu, 27 Feb 2003 13:17:48 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 6CCA343FA3
	for <perforce@freebsd.org>; Thu, 27 Feb 2003 13:17:48 -0800 (PST)
	(envelope-from jhb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h1RLHm0U051286
	for <perforce@freebsd.org>; Thu, 27 Feb 2003 13:17:48 -0800 (PST)
	(envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h1RLHlQx051283
	for perforce@freebsd.org; Thu, 27 Feb 2003 13:17:48 -0800 (PST)
Date: Thu, 27 Feb 2003 13:17:48 -0800 (PST)
Message-Id: <200302272117.h1RLHlQx051283@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f
From: John Baldwin <jhb@FreeBSD.org>
Subject: PERFORCE change 26038 for review
To: Perforce Change Reviews <perforce@freebsd.org>
Sender: owner-p4-projects@FreeBSD.ORG
Precedence: bulk
List-ID: <p4-projects.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20p4-projects>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20p4-projects>
X-Loop: FreeBSD.ORG

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

Change 26038 by jhb@jhb_laptop on 2003/02/27 13:17:03

	Integ NFS bugfix to stop my box from panic'ing.

Affected files ...

.. //depot/projects/smpng/sys/nfsclient/nfs_vnops.c#21 integrate

Differences ...

==== //depot/projects/smpng/sys/nfsclient/nfs_vnops.c#21 (text+ko) ====

@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/nfsclient/nfs_vnops.c,v 1.196 2003/02/25 08:50:21 jeff Exp $");
+__FBSDID("$FreeBSD: src/sys/nfsclient/nfs_vnops.c,v 1.197 2003/02/26 00:24:19 jeff Exp $");
 
 /*
  * vnode op calls for Sun NFS version 2 and 3
@@ -2659,8 +2659,11 @@
 			if (bvecpos >= bvecsize)
 				break;
 			if ((bp->b_flags & (B_DELWRI | B_NEEDCOMMIT)) !=
-			    (B_DELWRI | B_NEEDCOMMIT) ||
-			    BUF_LOCK(bp,
+			    (B_DELWRI | B_NEEDCOMMIT)) {
+				nbp = TAILQ_NEXT(bp, b_vnbufs);
+				continue;
+			}
+			if (BUF_LOCK(bp,
 			    LK_EXCLUSIVE | LK_NOWAIT | LK_INTERLOCK,
 			    VI_MTX(vp))) {
 				VI_LOCK(vp);

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe p4-projects" in the body of the message