From owner-p4-projects@FreeBSD.ORG  Sun Sep  5 22:32:53 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 6881E16A4F3; Sun,  5 Sep 2004 22:32:52 +0000 (GMT)
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 17ACE16A4CF
	for <perforce@freebsd.org>; Sun,  5 Sep 2004 22:32:52 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 0DB3043D1D
	for <perforce@freebsd.org>; Sun,  5 Sep 2004 22:32:52 +0000 (GMT)
	(envelope-from julian@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i85MWp4H048572
	for <perforce@freebsd.org>; Sun, 5 Sep 2004 22:32:51 GMT
	(envelope-from julian@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i85MWpOE048569
	for perforce@freebsd.org; Sun, 5 Sep 2004 22:32:51 GMT
	(envelope-from julian@freebsd.org)
Date: Sun, 5 Sep 2004 22:32:51 GMT
Message-Id: <200409052232.i85MWpOE048569@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	julian@freebsd.org using -f
From: Julian Elischer <julian@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 61066 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
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: Sun, 05 Sep 2004 22:32:53 -0000

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

Change 61066 by julian@julian_ref on 2004/09/05 22:32:50

	Confirming IFC complete

Affected files ...

.. //depot/projects/nsched/sys/kern/vfs_mount.c#8 integrate

Differences ...

==== //depot/projects/nsched/sys/kern/vfs_mount.c#8 (text+ko) ====

@@ -59,7 +59,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/vfs_mount.c,v 1.138 2004/07/30 22:08:52 phk Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/vfs_mount.c,v 1.139 2004/09/05 22:24:28 alfred Exp $");
 
 #include <sys/param.h>
 #include <sys/conf.h>
@@ -274,7 +274,7 @@
 		optlen = auio->uio_iov[i + 1].iov_len;
 		opt->name = malloc(namelen, M_MOUNT, M_WAITOK);
 		opt->value = NULL;
-		opt->len = optlen;
+		opt->len = 0;
 
 		/*
 		 * Do this early, so jumps to "bad" will free the current
@@ -308,6 +308,7 @@
 			goto bad;
 		}
 		if (optlen != 0) {
+			opt->len = optlen;
 			opt->value = malloc(optlen, M_MOUNT, M_WAITOK);
 			if (auio->uio_segflg == UIO_SYSSPACE) {
 				bcopy(auio->uio_iov[i + 1].iov_base, opt->value,