From owner-p4-projects@FreeBSD.ORG  Wed Jul  6 15:56:23 2005
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 67BAF16A425; Wed,  6 Jul 2005 15:56:22 +0000 (GMT)
X-Original-To: perforce@freebsd.org
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 1F01E16A43B
	for <perforce@freebsd.org>; Wed,  6 Jul 2005 15:56:22 +0000 (GMT)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id EBBC643D48
	for <perforce@freebsd.org>; Wed,  6 Jul 2005 15:56:21 +0000 (GMT)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j66FuLkB019239
	for <perforce@freebsd.org>; Wed, 6 Jul 2005 15:56:21 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j66FuLcF019236
	for perforce@freebsd.org; Wed, 6 Jul 2005 15:56:21 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Wed, 6 Jul 2005 15:56:21 GMT
Message-Id: <200507061556.j66FuLcF019236@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 79661 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
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: Wed, 06 Jul 2005 15:56:24 -0000

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

Change 79661 by rwatson@rwatson_zoo on 2005/07/06 15:55:46

	Likely fix for nmount(1) use in mounting UFS.
	
	Submitted by:	Suleiman Souhlal <souhlal@FreeBSD.org>

Affected files ...

.. //depot/projects/trustedbsd/sebsd/sbin/mount_ufs/mount_ufs.c#2 edit

Differences ...

==== //depot/projects/trustedbsd/sebsd/sbin/mount_ufs/mount_ufs.c#2 (text+ko) ====

@@ -72,12 +72,12 @@
 	struct iovec *iov;
 	int iovlen;
 	struct export_args export;
-	int ch, i, mntflags, opts, ufs_flags;
+	int ch, i, mntflags, opts;
 	char *dev, *dir, mntpath[MAXPATHLEN];
 	char *cs_disk, *cs_local;
 	int verbose;
 
-	i = mntflags = opts = ufs_flags = verbose = 0;
+	i = mntflags = opts = verbose = 0;
 	cs_disk = cs_local = NULL;
 	while ((ch = getopt(argc, argv, "o:v")) != -1)
 		switch (ch) {
@@ -119,7 +119,6 @@
 	build_iovec(&iov, &iovlen, "fstype", "ufs", -1);
 	build_iovec(&iov, &iovlen, "fspath", mntpath, -1);
 	build_iovec(&iov, &iovlen, "from", dev, -1);
-	build_iovec(&iov, &iovlen, "flags", &ufs_flags, sizeof ufs_flags);
 	build_iovec(&iov, &iovlen, "export", &export, sizeof export);
 	if (nmount(iov, iovlen, mntflags) < 0)
 		err(1, "%s", dev);