PERFORCE change 20176 for review

[Robert Watson]

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

Change 20176 by rwatson at rwatson_curry on 2002/10/25 20:13:22

	We now don't permit the multilabel flag to change on file
	systems once they are mounted, for cache coherency reasons.
	Remove the hack to change the flag under some circumstances.

Affected files ...

.. //depot/projects/trustedbsd/mac/sys/ufs/ufs/ufs_extattr.c#22 edit

Differences ...

==== //depot/projects/trustedbsd/mac/sys/ufs/ufs/ufs_extattr.c#22 (text+ko) ====

@@ -41,13 +41,11 @@
  * Support for filesystem extended attribute: UFS-specific support functions.
  */
 
-#include "opt_mac.h"
 #include "opt_ufs.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
-#include <sys/mac.h>
 #include <sys/namei.h>
 #include <sys/malloc.h>
 #include <sys/fcntl.h>
@@ -687,15 +685,6 @@
 	if (!uele)
 		return (ENOATTR);
 
-#ifdef MAC
-	/*
-	 * Hack to disable MAC operations as specified by the mnt_flag
-	 * if system/freebsd.mac is disabled.
-	 */
-	if (attrnamespace == FREEBSD_MAC_EXTATTR_NAMESPACE &&
-	    strcmp(attrname, FREEBSD_MAC_EXTATTR_NAME) == 0)
-		ump->um_mountp->mnt_flag &= ~MNT_MULTILABEL;
-#endif /* MAC */
 	LIST_REMOVE(uele, uele_entries);
 
 	ASSERT_VOP_LOCKED(uele->uele_backing_vnode, "ufs_extattr_disable");
To Unsubscribe: send mail to majordomo at trustedbsd.org
with "unsubscribe trustedbsd-cvs" in the body of the message