PERFORCE change 153597 for review

Edward Tomasz Napierala trasz at FreeBSD.org
Wed Nov 26 04:18:55 PST 2008


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

Change 153597 by trasz at 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:


More information about the p4-projects mailing list