PERFORCE change 162786 for review

[Edward Tomasz Napierala]

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

Change 162786 by trasz at trasz_victim on 2009/05/26 17:09:23

	IFC.

Affected files ...

.. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/nfs/nfs_commonacl.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/geom/geom_subr.c#8 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/Makefile#19 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/nfscbd/Makefile#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/nfscbd/nfscbd.8#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/nfscbd/nfscbd.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/nfsdumpstate/Makefile#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/nfsdumpstate/nfsdumpstate.8#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/nfsdumpstate/nfsdumpstate.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/nfsrevoke/Makefile#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/nfsrevoke/nfsrevoke.8#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/nfsrevoke/nfsrevoke.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/nfsuserd/Makefile#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/nfsuserd/nfsuserd.8#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/nfsuserd/nfsuserd.c#1 branch

Differences ...

==== //depot/projects/soc2008/trasz_nfs4acl/sys/fs/nfs/nfs_commonacl.c#4 (text+ko) ====

@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/fs/nfs/nfs_commonacl.c,v 1.1 2009/05/04 15:23:58 rmacklem Exp $");
+__FBSDID("$FreeBSD: src/sys/fs/nfs/nfs_commonacl.c,v 1.2 2009/05/26 17:01:00 trasz Exp $");
 
 #ifndef APPLEKEXT
 #include <fs/nfs/nfsport.h>

==== //depot/projects/soc2008/trasz_nfs4acl/sys/geom/geom_subr.c#8 (text+ko) ====

@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/geom/geom_subr.c,v 1.104 2009/05/26 10:03:44 lulf Exp $");
+__FBSDID("$FreeBSD: src/sys/geom/geom_subr.c,v 1.105 2009/05/26 14:15:06 lulf Exp $");
 
 #include "opt_ddb.h"
 
@@ -1310,11 +1310,11 @@
 		db_print_bio_flags(bp);
 		db_printf("  cflags: 0x%hhx\n", bp->bio_cflags);
 		db_printf("  pflags: 0x%hhx\n", bp->bio_pflags);
-		db_printf("  offset: %lld\n", bp->bio_offset);
-		db_printf("  length: %lld\n", bp->bio_length);
+		db_printf("  offset: %jd\n", (intmax_t)bp->bio_offset);
+		db_printf("  length: %jd\n", (intmax_t)bp->bio_length);
 		db_printf("  bcount: %ld\n", bp->bio_bcount);
 		db_printf("  resid: %ld\n", bp->bio_resid);
-		db_printf("  completed: %lld\n", bp->bio_completed);
+		db_printf("  completed: %jd\n", (intmax_t)bp->bio_completed);
 		db_printf("  children: %u\n", bp->bio_children);
 		db_printf("  inbed: %u\n", bp->bio_inbed);
 		db_printf("  error: %d\n", bp->bio_error);

==== //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/Makefile#19 (text+ko) ====

@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	5.20 (Berkeley) 6/12/93
-# $FreeBSD: src/usr.sbin/Makefile,v 1.411 2009/04/16 14:43:59 rwatson Exp $
+# $FreeBSD: src/usr.sbin/Makefile,v 1.412 2009/05/26 15:19:04 rmacklem Exp $
 
 .include <bsd.own.mk>
 
@@ -110,7 +110,11 @@
 	${_ndiscvt} \
 	${_ndp} \
 	newsyslog \
+	nfscbd \
 	nfsd \
+	nfsdumpstate \
+	nfsrevoke \
+	nfsuserd \
 	${_ngctl} \
 	${_nghook} \
 	nologin \