From owner-p4-projects  Fri Oct 25 20:14:20 2002
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id B2C6237B404; Fri, 25 Oct 2002 20:14:18 -0700 (PDT)
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 4AC0E37B401
	for <perforce@freebsd.org>; Fri, 25 Oct 2002 20:14:18 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id A5C1943E4A
	for <perforce@freebsd.org>; Fri, 25 Oct 2002 20:14:17 -0700 (PDT)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id g9Q3DPmV054515
	for <perforce@freebsd.org>; Fri, 25 Oct 2002 20:13:25 -0700 (PDT)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id g9Q3DPF2054512
	for perforce@freebsd.org; Fri, 25 Oct 2002 20:13:25 -0700 (PDT)
Date: Fri, 25 Oct 2002 20:13:25 -0700 (PDT)
Message-Id: <200210260313.g9Q3DPF2054512@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>
Subject: PERFORCE change 20176 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=20176

Change 20176 by rwatson@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@FreeBSD.org
with "unsubscribe p4-projects" in the body of the message