From owner-p4-projects  Wed Jan  8 10:38:12 2003
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id D0C8E37B405; Wed,  8 Jan 2003 10:38:09 -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 682DC37B401
	for <perforce@freebsd.org>; Wed,  8 Jan 2003 10:38:09 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 1CE4243EE1
	for <perforce@freebsd.org>; Wed,  8 Jan 2003 10:38:09 -0800 (PST)
	(envelope-from green@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 h08Ic8fh096112
	for <perforce@freebsd.org>; Wed, 8 Jan 2003 10:38:08 -0800 (PST)
	(envelope-from green@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h08Ic8U0096109
	for perforce@freebsd.org; Wed, 8 Jan 2003 10:38:08 -0800 (PST)
Date: Wed, 8 Jan 2003 10:38:08 -0800 (PST)
Message-Id: <200301081838.h08Ic8U0096109@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to green@freebsd.org using -f
From: Brian Feldman <green@FreeBSD.org>
Subject: PERFORCE change 23431 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=23431

Change 23431 by green@green_laptop_2 on 2003/01/08 10:37:59

	The pseudofs-based filesystems do will need multilabel set
	before anything else can work; do what devfs does, which doesn't
	actually seem to work, though.  Also, remove an unused
	VOP_REFRESHLABEL() implementation and such.

Affected files ...

.. //depot/projects/trustedbsd/mac/sys/fs/pseudofs/pseudofs.c#8 edit
.. //depot/projects/trustedbsd/mac/sys/fs/pseudofs/pseudofs_vnops.c#22 edit

Differences ...

==== //depot/projects/trustedbsd/mac/sys/fs/pseudofs/pseudofs.c#8 (text+ko) ====

@@ -32,6 +32,7 @@
 #include <sys/kernel.h>
 #include <sys/systm.h>
 #include <sys/lock.h>
+#include <sys/mac.h>
 #include <sys/malloc.h>
 #include <sys/module.h>
 #include <sys/mount.h>
@@ -44,6 +45,8 @@
 #include <fs/pseudofs/pseudofs.h>
 #include <fs/pseudofs/pseudofs_internal.h>
 
+#include "opt_mac.h"
+
 static MALLOC_DEFINE(M_PFSNODES, "pfs_nodes", "pseudofs nodes");
 
 SYSCTL_NODE(_vfs, OID_AUTO, pfs, CTLFLAG_RW, 0,
@@ -252,6 +255,9 @@
 		return (EOPNOTSUPP);
 
 	mp->mnt_flag |= MNT_LOCAL;
+#ifdef MAC
+	mp->mnt_flag |= MNT_MULTILABEL;
+#endif
 	mp->mnt_data = (qaddr_t)pi;
 	vfs_getnewfsid(mp);
 

==== //depot/projects/trustedbsd/mac/sys/fs/pseudofs/pseudofs_vnops.c#22 (text+ko) ====

@@ -821,9 +821,6 @@
 	{ &vop_readdir_desc,		(vop_t *)pfs_readdir	},
 	{ &vop_readlink_desc,		(vop_t *)pfs_readlink	},
 	{ &vop_reclaim_desc,		(vop_t *)pfs_reclaim	},
-#ifdef MAC
-	{ &vop_refreshlabel_desc,	(vop_t *)pfs_refreshlabel },
-#endif
 	{ &vop_remove_desc,		(vop_t *)vop_eopnotsupp	},
 	{ &vop_rename_desc,		(vop_t *)vop_eopnotsupp	},
 	{ &vop_rmdir_desc,		(vop_t *)vop_eopnotsupp	},

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