From owner-p4-projects Thu Jul 11 21:54:35 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CEDC037B401; Thu, 11 Jul 2002 21:54:30 -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 6D4A637B400 for ; Thu, 11 Jul 2002 21:54:30 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 29C7D43E31 for ; Thu, 11 Jul 2002 21:54:30 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6C4sUJU009800 for ; Thu, 11 Jul 2002 21:54:30 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6C4sTax009797 for perforce@freebsd.org; Thu, 11 Jul 2002 21:54:29 -0700 (PDT) Date: Thu, 11 Jul 2002 21:54:29 -0700 (PDT) Message-Id: <200207120454.g6C4sTax009797@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 14125 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14125 Change 14125 by rwatson@rwatson_paprika on 2002/07/11 21:54:24 Back out the lazy instantiate component of @14031, as it broke mount-derived labels on multilabel (read-only or full) file systems, as the EA write could result in a failure of the label refresh, even though a valid label is available. Approved by: green Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#164 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#164 (text+ko) ==== @@ -913,18 +913,11 @@ case ENOATTR: /* - * Use the label from the mountpoint. Take this opportunity - * to lazy-instantiate, just for correctness. + * Use the label from the mountpoint. */ mac_update_vnode_from_mount(vp, vp->v_mount); - error = mac_externalize(&vp->v_label, &extmac); - if (error) - return (error); - error = vn_extattr_set(vp, IO_NODELOCKED, - FREEBSD_MAC_EXTATTR_NAMESPACE, FREEBSD_MAC_EXTATTR_NAME, - sizeof(extmac), (char *)&extmac, curthread); - if (error == 0) - break; + return (0); + case EOPNOTSUPP: default: /* Fail horribly. */ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message