From owner-p4-projects@FreeBSD.ORG  Wed Nov 26 12:18:55 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 620F81065675; Wed, 26 Nov 2008 12:18:55 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 252341065672
	for <perforce@freebsd.org>; Wed, 26 Nov 2008 12:18:55 +0000 (UTC)
	(envelope-from trasz@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 095E78FC14
	for <perforce@freebsd.org>; Wed, 26 Nov 2008 12:18:55 +0000 (UTC)
	(envelope-from trasz@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mAQCIsF8075441
	for <perforce@freebsd.org>; Wed, 26 Nov 2008 12:18:54 GMT
	(envelope-from trasz@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mAQCIsf3075439
	for perforce@freebsd.org; Wed, 26 Nov 2008 12:18:54 GMT
	(envelope-from trasz@freebsd.org)
Date: Wed, 26 Nov 2008 12:18:54 GMT
Message-Id: <200811261218.mAQCIsf3075439@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	trasz@freebsd.org using -f
From: Edward Tomasz Napierala <trasz@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 153597 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 26 Nov 2008 12:18:55 -0000

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

Change 153597 by trasz@trasz_strashydlo on 2008/11/26 12:18:12

	Remove spurious differences.

Affected files ...

.. //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/VOP_ACCESS.9#5 edit
.. //depot/projects/soc2008/trasz_nfs4acl/sys/ufs/ffs/ffs_inode.c#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/acltools/00.t#7 edit
.. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/acltools/run#5 edit

Differences ...

==== //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/VOP_ACCESS.9#5 (text+ko) ====

@@ -76,12 +76,6 @@
     int error;
 
     /*
-     * Our example does not implement granular access control.
-     */
-    if (unixify_vaccess(&mode, &error))
-	return (error);
-
-    /*
      * Disallow write attempts on read-only file systems;
      * unless the file is a socket, fifo, or a block or
      * character device resident on the filesystem.

==== //depot/projects/soc2008/trasz_nfs4acl/sys/ufs/ffs/ffs_inode.c#6 (text+ko) ====

@@ -481,7 +481,7 @@
 		}
 	}
 done:
-#if 0
+#ifdef INVARIANTS
 	for (level = SINGLE; level <= TRIPLE; level++)
 		if (newblks[NDADDR + level] != DIP(ip, i_ib[level]))
 			panic("ffs_truncate1");

==== //depot/projects/soc2008/trasz_nfs4acl/tools/regression/acltools/00.t#7 (text+ko) ====

@@ -10,6 +10,8 @@
 #
 # Output should be obvious.
 #
+# $FreeBSD: src/tools/regression/acltools/00.t,v 1.1 2008/11/25 18:29:33 trasz Exp $
+#
 
 echo "1..4"
 

==== //depot/projects/soc2008/trasz_nfs4acl/tools/regression/acltools/run#5 (text+ko) ====

@@ -26,6 +26,9 @@
 # LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
+#
+# $FreeBSD: src/tools/regression/acltools/run,v 1.1 2008/11/25 18:29:33 trasz Exp $
+#
 
 #
 # Possible improvements: