From owner-p4-projects  Mon Mar 25 11:26:44 2002
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 4911337B41A; Mon, 25 Mar 2002 11:26:41 -0800 (PST)
Delivered-To: perforce@freebsd.org
Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21])
	by hub.freebsd.org (Postfix) with ESMTP id BDEF437B405
	for <perforce@freebsd.org>; Mon, 25 Mar 2002 11:26:38 -0800 (PST)
Received: (from perforce@localhost)
	by freefall.freebsd.org (8.11.6/8.11.6) id g2PJQc082724
	for perforce@freebsd.org; Mon, 25 Mar 2002 11:26:38 -0800 (PST)
	(envelope-from jhb@freebsd.org)
Date: Mon, 25 Mar 2002 11:26:38 -0800 (PST)
Message-Id: <200203251926.g2PJQc082724@freefall.freebsd.org>
X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jhb@freebsd.org using -f
From: John Baldwin <jhb@FreeBSD.org>
Subject: PERFORCE change 8390 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://people.freebsd.org/~peter/p4db/chv.cgi?CH=8390

Change 8390 by jhb@jhb_laptop on 2002/03/25 11:25:52

	Fix a mis-merge.

Affected files ...

... //depot/projects/smpng/sys/nfsserver/nfs_serv.c#14 edit

Differences ...

==== //depot/projects/smpng/sys/nfsserver/nfs_serv.c#14 (text+ko) ====

@@ -1743,7 +1743,7 @@
 				vap->va_type = VFIFO;
                         if (vap->va_type != VFIFO &&
                             (error = suser_cred(cred, 0))) {
-				goto nfsmreply0;
+				goto ereply;
                         }
 			vap->va_rdev = rdev;
 			error = VOP_MKNOD(nd.ni_dvp, &nd.ni_vp, &nd.ni_cnd, vap);

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