From owner-p4-projects@FreeBSD.ORG Tue May 26 17:09:59 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AB5871065676; Tue, 26 May 2009 17:09:59 +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 51F871065672 for ; Tue, 26 May 2009 17:09:59 +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 36E208FC13 for ; Tue, 26 May 2009 17:09:59 +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 n4QH9x5w011139 for ; Tue, 26 May 2009 17:09:59 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4QH9x06011137 for perforce@freebsd.org; Tue, 26 May 2009 17:09:59 GMT (envelope-from trasz@freebsd.org) Date: Tue, 26 May 2009 17:09:59 GMT Message-Id: <200905261709.n4QH9x06011137@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 162786 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 May 2009 17:10:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=162786 Change 162786 by trasz@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 -__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 ==== //depot/projects/soc2008/trasz_nfs4acl/sys/geom/geom_subr.c#8 (text+ko) ==== @@ -34,7 +34,7 @@ */ #include -__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 @@ -110,7 +110,11 @@ ${_ndiscvt} \ ${_ndp} \ newsyslog \ + nfscbd \ nfsd \ + nfsdumpstate \ + nfsrevoke \ + nfsuserd \ ${_ngctl} \ ${_nghook} \ nologin \