From owner-p4-projects@FreeBSD.ORG  Wed Mar  8 21:02:15 2006
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 317EE16A42B; Wed,  8 Mar 2006 21:02:14 +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 90C6F16A46F
	for <perforce@freebsd.org>; Wed,  8 Mar 2006 21:02:12 +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 83FE943E13
	for <perforce@freebsd.org>; Wed,  8 Mar 2006 21:01:56 +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 k28L1u1r040515
	for <perforce@freebsd.org>; Wed, 8 Mar 2006 21:01:56 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 k28L1uah040512
	for perforce@freebsd.org; Wed, 8 Mar 2006 21:01:56 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Wed, 8 Mar 2006 21:01:56 GMT
Message-Id: <200603082101.k28L1uah040512@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 92982 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, 08 Mar 2006 21:02:16 -0000

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

Change 92982 by rwatson@rwatson_peppercorn on 2006/03/08 21:01:51

	For the time being, ignore the label argument when mounting UFS.
	Future integrations will bring in the conversion of mount_ufs to
	nmount().

Affected files ...

.. //depot/projects/trustedbsd/sebsd/sbin/mount/mount_ufs.c#6 edit

Differences ...

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

@@ -106,6 +106,7 @@
 	else
 		args.export.ex_flags = 0;
 
+#if 0
 	if (ltext) {
 		mac_t mac;
 		rc = mac_from_text(&mac, ltext);
@@ -115,9 +116,9 @@
 		}
 
 		rc = lmount("ufs", fs_name, mntflags, &args, mac);
-	}
-	else
-		rc = mount("ufs", fs_name, mntflags, &args);
+	} else
+#endif
+	rc = mount("ufs", fs_name, mntflags, &args);
 
 	if (rc < 0) {
 		switch (errno) {