PERFORCE change 23431 for review

[Brian Feldman]

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

Change 23431 by green at 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 at trustedbsd.org
with "unsubscribe trustedbsd-cvs" in the body of the message