Date: Thu, 27 Mar 2008 20:07:08 GMT From: John Birrell <jb@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 138741 for review Message-ID: <200803272007.m2RK78xx050694@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=138741 Change 138741 by jb@jb_freebsd1 on 2008/03/27 20:06:15 IFC Affected files ... .. //depot/projects/dtrace/ports/Mk/bsd.sites.mk#25 integrate .. //depot/projects/dtrace/src/sys/amd64/conf/GENERIC#36 integrate .. //depot/projects/dtrace/src/sys/arm/conf/AVILA#8 integrate .. //depot/projects/dtrace/src/sys/arm/conf/BWCT#3 integrate .. //depot/projects/dtrace/src/sys/arm/conf/CRB#3 integrate .. //depot/projects/dtrace/src/sys/arm/conf/EP80219#6 integrate .. //depot/projects/dtrace/src/sys/arm/conf/HL200#3 integrate .. //depot/projects/dtrace/src/sys/arm/conf/IQ31244#8 integrate .. //depot/projects/dtrace/src/sys/arm/conf/KB920X#10 integrate .. //depot/projects/dtrace/src/sys/arm/conf/SIMICS#8 integrate .. //depot/projects/dtrace/src/sys/arm/conf/SKYEYE#8 integrate .. //depot/projects/dtrace/src/sys/i386/conf/GENERIC#33 integrate .. //depot/projects/dtrace/src/sys/i386/conf/XBOX#6 integrate .. //depot/projects/dtrace/src/sys/ia64/conf/GENERIC#14 integrate .. //depot/projects/dtrace/src/sys/modules/Makefile#38 integrate .. //depot/projects/dtrace/src/sys/modules/krpc/Makefile#1 branch .. //depot/projects/dtrace/src/sys/modules/nfslockd/Makefile#1 branch .. //depot/projects/dtrace/src/sys/net/if.h#10 integrate .. //depot/projects/dtrace/src/sys/nlm/nlm_prot_impl.c#2 integrate .. //depot/projects/dtrace/src/sys/pc98/conf/GENERIC#16 integrate .. //depot/projects/dtrace/src/sys/powerpc/conf/GENERIC#16 integrate .. //depot/projects/dtrace/src/sys/rpc/rpc_generic.c#2 integrate .. //depot/projects/dtrace/src/sys/sparc64/conf/GENERIC#19 integrate .. //depot/projects/dtrace/src/sys/sun4v/conf/GENERIC#20 integrate .. //depot/projects/dtrace/src/usr.sbin/rpc.lockd/lockd.c#9 integrate .. //depot/projects/dtrace/src/usr.sbin/rpc.lockd/rpc.lockd.8#7 integrate .. //depot/projects/dtrace/www/en/releases/6.3R/errata.html#5 integrate .. //depot/projects/dtrace/www/share/sgml/news.xml#44 integrate Differences ... ==== //depot/projects/dtrace/ports/Mk/bsd.sites.mk#25 (text+ko) ==== @@ -20,7 +20,7 @@ # # Note: all entries should terminate with a slash. # -# $FreeBSD: ports/Mk/bsd.sites.mk,v 1.440 2008/03/13 11:21:27 edwin Exp $ +# $FreeBSD: ports/Mk/bsd.sites.mk,v 1.441 2008/03/27 16:43:21 ehaupt Exp $ # # Where to put distfiles that don't have any other master site @@ -137,6 +137,13 @@ ftp://ftp.uu.net/usenet/comp.sources.%SUBDIR%/ .endif +.if !defined(IGNORE_MASTER_SITE_CRITICAL) +MASTER_SITE_CRITICAL+= \ + http://critical.ch/distfiles/%SUBDIR%/ \ + http://energy.critical.ch/distfiles/%SUBDIR%/ \ + http://sauerkraut.critical.ch/distfiles/%SUBDIR%/ +.endif + .if !defined(IGNORE_MASTER_SITE_CSME) MASTER_SITE_CSME+= ${MASTER_SITE_CENKES} .endif ==== //depot/projects/dtrace/src/sys/amd64/conf/GENERIC#36 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.494 2008/03/05 14:13:29 rink Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.495 2008/03/27 11:54:17 dfr Exp $ cpu HAMMER ident GENERIC @@ -39,6 +39,7 @@ options MD_ROOT # MD is a potential root device options NFSCLIENT # Network Filesystem Client options NFSSERVER # Network Filesystem Server +options NFSLOCKD # Network Lock Manager options NFS_ROOT # NFS usable as /, requires NFSCLIENT options NTFS # NT File System options MSDOSFS # MSDOS Filesystem ==== //depot/projects/dtrace/src/sys/arm/conf/AVILA#8 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/arm/conf/AVILA,v 1.10 2008/03/20 17:44:58 sam Exp $ +# $FreeBSD: src/sys/arm/conf/AVILA,v 1.11 2008/03/27 11:54:17 dfr Exp $ machine arm ident AVILA @@ -57,6 +57,7 @@ options UFS_DIRHASH #Improve performance on big directories options NFSCLIENT #Network Filesystem Client options NFSSERVER #Network Filesystem Server +options NFSLOCKD #Network Lock Manager options NFS_ROOT #NFS usable as /, requires NFSCLIENT #options MSDOSFS #MSDOS Filesystem options CD9660 #ISO 9660 Filesystem ==== //depot/projects/dtrace/src/sys/arm/conf/BWCT#3 (text+ko) ==== @@ -15,7 +15,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/arm/conf/BWCT,v 1.3 2007/12/02 13:10:41 cognet Exp $ +# $FreeBSD: src/sys/arm/conf/BWCT,v 1.4 2008/03/27 11:54:17 dfr Exp $ machine arm ident BWCT @@ -48,6 +48,7 @@ #options ROOTDEVNAME=\"ufs:/dev/mmcsd0s1a\" options NFSCLIENT #Network Filesystem Client #options NFSSERVER #Network Filesystem Server +#options NFSLOCKD #Network Lock Manager options NFS_ROOT #NFS usable as /, requires NFSCLIENT options BOOTP_NFSROOT options BOOTP ==== //depot/projects/dtrace/src/sys/arm/conf/CRB#3 (text+ko) ==== @@ -15,7 +15,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/arm/conf/CRB,v 1.3 2007/12/02 13:10:41 cognet Exp $ +# $FreeBSD: src/sys/arm/conf/CRB,v 1.4 2008/03/27 11:54:17 dfr Exp $ machine arm ident CRB @@ -45,6 +45,7 @@ options UFS_DIRHASH #Improve performance on big directories options NFSCLIENT #Network Filesystem Client options NFSSERVER #Network Filesystem Server +options NFSLOCKD #Network Lock Manager options NFS_ROOT #NFS usable as /, requires NFSCLIENT #options MSDOSFS #MSDOS Filesystem options CD9660 #ISO 9660 Filesystem ==== //depot/projects/dtrace/src/sys/arm/conf/EP80219#6 (text+ko) ==== @@ -15,7 +15,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/arm/conf/EP80219,v 1.6 2007/12/02 13:10:41 cognet Exp $ +# $FreeBSD: src/sys/arm/conf/EP80219,v 1.7 2008/03/27 11:54:17 dfr Exp $ machine arm ident EP80219 @@ -44,6 +44,7 @@ options UFS_DIRHASH #Improve performance on big directories options NFSCLIENT #Network Filesystem Client options NFSSERVER #Network Filesystem Server +options NFSLOCKD #Network Lock Manager options NFS_ROOT #NFS usable as /, requires NFSCLIENT #options MSDOSFS #MSDOS Filesystem options CD9660 #ISO 9660 Filesystem ==== //depot/projects/dtrace/src/sys/arm/conf/HL200#3 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/arm/conf/HL200,v 1.2 2007/12/02 13:10:41 cognet Exp $ +# $FreeBSD: src/sys/arm/conf/HL200,v 1.3 2008/03/27 11:54:18 dfr Exp $ machine arm ident HL200 @@ -51,6 +51,7 @@ #options ROOTDEVNAME=\"ufs:/dev/mmcsd0s1a\" options NFSCLIENT #Network Filesystem Client #options NFSSERVER #Network Filesystem Server +#options NFSLOCKD #Network Lock Manager options NFS_ROOT #NFS usable as /, requires NFSCLIENT options BOOTP_NFSROOT options BOOTP ==== //depot/projects/dtrace/src/sys/arm/conf/IQ31244#8 (text+ko) ==== @@ -15,7 +15,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/arm/conf/IQ31244,v 1.20 2007/12/02 13:10:41 cognet Exp $ +# $FreeBSD: src/sys/arm/conf/IQ31244,v 1.21 2008/03/27 11:54:18 dfr Exp $ machine arm ident IQ31244 @@ -45,6 +45,7 @@ options UFS_DIRHASH #Improve performance on big directories options NFSCLIENT #Network Filesystem Client options NFSSERVER #Network Filesystem Server +options NFSLOCKD #Network Lock Manager options NFS_ROOT #NFS usable as /, requires NFSCLIENT #options MSDOSFS #MSDOS Filesystem options CD9660 #ISO 9660 Filesystem ==== //depot/projects/dtrace/src/sys/arm/conf/KB920X#10 (text) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/arm/conf/KB920X,v 1.14 2007/12/02 13:10:41 cognet Exp $ +# $FreeBSD: src/sys/arm/conf/KB920X,v 1.15 2008/03/27 11:54:18 dfr Exp $ machine arm ident KB920X @@ -42,6 +42,7 @@ options ROOTDEVNAME=\"ufs:/dev/mmcsd0s1a\" options NFSCLIENT #Network Filesystem Client #options NFSSERVER #Network Filesystem Server +#options NFSLOCKD #Network Lock Manager #options NFS_ROOT #NFS usable as /, requires NFSCLIENT #options BOOTP_NFSROOT #options BOOTP ==== //depot/projects/dtrace/src/sys/arm/conf/SIMICS#8 (text+ko) ==== @@ -15,7 +15,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/arm/conf/SIMICS,v 1.14 2007/12/02 13:10:42 cognet Exp $ +# $FreeBSD: src/sys/arm/conf/SIMICS,v 1.15 2008/03/27 11:54:18 dfr Exp $ machine arm ident SIMICS @@ -43,6 +43,7 @@ options ROOTDEVNAME=\"ufs:md0\" options NFSCLIENT #Network Filesystem Client options NFSSERVER #Network Filesystem Server +options NFSLOCKD #Network Lock Manager options NFS_ROOT #NFS usable as /, requires NFSCLIENT #options MSDOSFS #MSDOS Filesystem options CD9660 #ISO 9660 Filesystem ==== //depot/projects/dtrace/src/sys/arm/conf/SKYEYE#8 (text) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/arm/conf/SKYEYE,v 1.8 2007/12/02 13:10:42 cognet Exp $ +# $FreeBSD: src/sys/arm/conf/SKYEYE,v 1.9 2008/03/27 11:54:18 dfr Exp $ machine arm ident KB920X @@ -46,6 +46,7 @@ options ROOTDEVNAME=\"ufs:md0\" options NFSCLIENT #Network Filesystem Client options NFSSERVER #Network Filesystem Server +options NFSLOCKD #Network Lock Manager options NFS_ROOT #NFS usable as /, requires NFSCLIENT #options MSDOSFS #MSDOS Filesystem options CD9660 #ISO 9660 Filesystem ==== //depot/projects/dtrace/src/sys/i386/conf/GENERIC#33 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.482 2008/03/05 14:13:30 rink Exp $ +# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.483 2008/03/27 11:54:18 dfr Exp $ cpu I486_CPU cpu I586_CPU @@ -41,6 +41,7 @@ options MD_ROOT # MD is a potential root device options NFSCLIENT # Network Filesystem Client options NFSSERVER # Network Filesystem Server +options NFSLOCKD # Network Lock Manager options NFS_ROOT # NFS usable as /, requires NFSCLIENT options MSDOSFS # MSDOS Filesystem options CD9660 # ISO 9660 Filesystem ==== //depot/projects/dtrace/src/sys/i386/conf/XBOX#6 (text+ko) ==== @@ -1,7 +1,7 @@ # # XBOX -- kernel for an XBOX # -# $FreeBSD: src/sys/i386/conf/XBOX,v 1.8 2007/11/28 05:50:44 attilio Exp $ +# $FreeBSD: src/sys/i386/conf/XBOX,v 1.9 2008/03/27 11:54:18 dfr Exp $ cpu I686_CPU # Celeron ident XBOX @@ -29,6 +29,7 @@ #options MD_ROOT # MD is a potential root device options NFSCLIENT # Network Filesystem Client #options NFSSERVER # Network Filesystem Server +#options NFSLOCKD # Network Lock Manager #options NFS_ROOT # NFS usable as /, requires NFSCLIENT #options MSDOSFS # MSDOS Filesystem options CD9660 # ISO 9660 Filesystem ==== //depot/projects/dtrace/src/sys/ia64/conf/GENERIC#14 (text+ko) ==== @@ -18,7 +18,7 @@ # # For hardware specific information check HARDWARE.TXT # -# $FreeBSD: src/sys/ia64/conf/GENERIC,v 1.95 2008/02/16 18:30:58 marcel Exp $ +# $FreeBSD: src/sys/ia64/conf/GENERIC,v 1.96 2008/03/27 11:54:18 dfr Exp $ cpu ITANIUM ident GENERIC @@ -44,6 +44,7 @@ options MSDOSFS # MSDOS Filesystem options NFSCLIENT # Network Filesystem Client options NFSSERVER # Network Filesystem Server +options NFSLOCKD # Network Lock Manager options NFS_ROOT # NFS usable as root device options PROCFS # Process filesystem (/proc) options PSEUDOFS # Pseudo-filesystem framework ==== //depot/projects/dtrace/src/sys/modules/Makefile#38 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/modules/Makefile,v 1.558 2008/03/06 08:09:45 rink Exp $ +# $FreeBSD: src/sys/modules/Makefile,v 1.559 2008/03/27 11:54:18 dfr Exp $ .include <bsd.own.mk> @@ -144,6 +144,7 @@ ${_ixgb} \ joy \ kbdmux \ + krpc \ kue \ le \ lge \ @@ -188,6 +189,7 @@ netgraph \ ${_nfe} \ nfsclient \ + nfslockd \ nfsserver \ nge \ nmdm \ ==== //depot/projects/dtrace/src/sys/net/if.h#10 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)if.h 8.1 (Berkeley) 6/10/93 - * $FreeBSD: src/sys/net/if.h,v 1.112 2007/12/15 22:06:23 kmacy Exp $ + * $FreeBSD: src/sys/net/if.h,v 1.113 2008/03/27 18:02:30 iedowse Exp $ */ #ifndef _NET_IF_H_ @@ -163,7 +163,8 @@ /* flags set internally only: */ #define IFF_CANTCHANGE \ (IFF_BROADCAST|IFF_POINTOPOINT|IFF_DRV_RUNNING|IFF_DRV_OACTIVE|\ - IFF_SIMPLEX|IFF_MULTICAST|IFF_ALLMULTI|IFF_SMART|IFF_PROMISC) + IFF_SIMPLEX|IFF_MULTICAST|IFF_ALLMULTI|IFF_SMART|IFF_PROMISC|\ + IFF_NEEDSGIANT) /* * Values for if_link_state. ==== //depot/projects/dtrace/src/sys/nlm/nlm_prot_impl.c#2 (text+ko) ==== @@ -28,7 +28,7 @@ #include "opt_inet6.h" #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/nlm/nlm_prot_impl.c,v 1.1 2008/03/26 15:23:10 dfr Exp $"); +__FBSDID("$FreeBSD: src/sys/nlm/nlm_prot_impl.c,v 1.2 2008/03/27 11:54:19 dfr Exp $"); #include <sys/param.h> #include <sys/fcntl.h> @@ -1781,3 +1781,23 @@ return (nlm_lockd); } + +/* + * Kernel module glue + */ +static int +nfslockd_modevent(module_t mod, int type, void *data) +{ + + return (0); +} +static moduledata_t nfslockd_mod = { + "nfslockd", + nfslockd_modevent, + NULL, +}; +DECLARE_MODULE(nfslockd, nfslockd_mod, SI_SUB_VFS, SI_ORDER_ANY); + +/* So that loader and kldload(2) can find us, wherever we are.. */ +MODULE_DEPEND(nfslockd, krpc, 1, 1, 1); +MODULE_VERSION(nfslockd, 1); ==== //depot/projects/dtrace/src/sys/pc98/conf/GENERIC#16 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/pc98/conf/GENERIC,v 1.301 2008/03/10 12:25:04 nyan Exp $ +# $FreeBSD: src/sys/pc98/conf/GENERIC,v 1.302 2008/03/27 11:54:19 dfr Exp $ cpu I486_CPU cpu I586_CPU @@ -41,6 +41,7 @@ options MD_ROOT # MD is a potential root device options NFSCLIENT # Network Filesystem Client options NFSSERVER # Network Filesystem Server +options NFSLOCKD # Network Lock Manager options NFS_ROOT # NFS usable as /, requires NFSCLIENT options MSDOSFS # MSDOS Filesystem options CD9660 # ISO 9660 Filesystem ==== //depot/projects/dtrace/src/sys/powerpc/conf/GENERIC#16 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/powerpc/conf/GENERIC,v 1.76 2008/02/16 17:59:27 marcel Exp $ +# $FreeBSD: src/sys/powerpc/conf/GENERIC,v 1.77 2008/03/27 11:54:19 dfr Exp $ cpu AIM ident GENERIC @@ -42,6 +42,7 @@ options MD_ROOT #MD is a potential root device options NFSCLIENT #Network Filesystem Client options NFSSERVER #Network Filesystem Server +options NFSLOCKD #Network Lock Manager options NFS_ROOT #NFS usable as root device options MSDOSFS #MSDOS Filesystem options CD9660 #ISO 9660 Filesystem ==== //depot/projects/dtrace/src/sys/rpc/rpc_generic.c#2 (text+ko) ==== @@ -34,7 +34,7 @@ /* #pragma ident "@(#)rpc_generic.c 1.17 94/04/24 SMI" */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/rpc/rpc_generic.c,v 1.1 2008/03/26 15:23:10 dfr Exp $"); +__FBSDID("$FreeBSD: src/sys/rpc/rpc_generic.c,v 1.2 2008/03/27 11:54:19 dfr Exp $"); /* * rpc_generic.c, Miscl routines for RPC. @@ -44,7 +44,9 @@ #include "opt_inet6.h" #include <sys/param.h> +#include <sys/kernel.h> #include <sys/malloc.h> +#include <sys/module.h> #include <sys/proc.h> #include <sys/protosw.h> #include <sys/sbuf.h> @@ -714,3 +716,22 @@ return bound; } + +/* + * Kernel module glue + */ +static int +krpc_modevent(module_t mod, int type, void *data) +{ + + return (0); +} +static moduledata_t krpc_mod = { + "krpc", + krpc_modevent, + NULL, +}; +DECLARE_MODULE(krpc, krpc_mod, SI_SUB_VFS, SI_ORDER_ANY); + +/* So that loader and kldload(2) can find us, wherever we are.. */ +MODULE_VERSION(krpc, 1); ==== //depot/projects/dtrace/src/sys/sparc64/conf/GENERIC#19 (text+ko) ==== @@ -18,7 +18,7 @@ # # For hardware specific information check HARDWARE.TXT # -# $FreeBSD: src/sys/sparc64/conf/GENERIC,v 1.132 2008/03/11 05:09:03 yongari Exp $ +# $FreeBSD: src/sys/sparc64/conf/GENERIC,v 1.133 2008/03/27 11:54:19 dfr Exp $ cpu SUN4U ident GENERIC @@ -44,6 +44,7 @@ options MD_ROOT # MD is a potential root device options NFSCLIENT # Network Filesystem Client options NFSSERVER # Network Filesystem Server +options NFSLOCKD # Network Lock Manager options NFS_ROOT # NFS usable as /, requires NFSCLIENT #options MSDOSFS # MSDOS Filesystem options CD9660 # ISO 9660 Filesystem ==== //depot/projects/dtrace/src/sys/sun4v/conf/GENERIC#20 (text+ko) ==== @@ -18,7 +18,7 @@ # # For hardware specific information check HARDWARE.TXT # -# $FreeBSD: src/sys/sun4v/conf/GENERIC,v 1.16 2007/12/02 20:40:35 rwatson Exp $ +# $FreeBSD: src/sys/sun4v/conf/GENERIC,v 1.17 2008/03/27 11:54:19 dfr Exp $ cpu SUN4V ident GENERIC @@ -42,6 +42,7 @@ options MD_ROOT # MD is a potential root device options NFSCLIENT # Network Filesystem Client options NFSSERVER # Network Filesystem Server +options NFSLOCKD # Network Lock Manager options NFS_ROOT # NFS usable as /, requires NFSCLIENT #options MSDOSFS # MSDOS Filesystem options NULLFS ==== //depot/projects/dtrace/src/usr.sbin/rpc.lockd/lockd.c#9 (text+ko) ==== @@ -1,5 +1,5 @@ /* $NetBSD: lockd.c,v 1.7 2000/08/12 18:08:44 thorpej Exp $ */ -/* $FreeBSD: src/usr.sbin/rpc.lockd/lockd.c,v 1.23 2008/03/26 15:23:12 dfr Exp $ */ +/* $FreeBSD: src/usr.sbin/rpc.lockd/lockd.c,v 1.25 2008/03/27 15:11:02 dfr Exp $ */ /* * Copyright (c) 1995 @@ -46,7 +46,9 @@ * The actual program logic is in the file lock_proc.c */ -#include <sys/types.h> +#include <sys/param.h> +#include <sys/linker.h> +#include <sys/module.h> #include <sys/socket.h> #include <sys/stat.h> @@ -116,7 +118,7 @@ int maxrec = RPC_MAXDATASIZE; in_port_t svcport = 0; - while ((ch = getopt(argc, argv, "d:g:h:kp:")) != (-1)) { + while ((ch = getopt(argc, argv, "d:g:h:p:")) != (-1)) { switch (ch) { case 'd': debug_level = atoi(optarg); @@ -153,9 +155,6 @@ out_of_mem(); } break; - case 'k': - kernel_lockd = TRUE; - break; case 'p': endptr = NULL; svcport = (in_port_t)strtoul(optarg, &endptr, 10); @@ -175,6 +174,16 @@ exit(1); } + kernel_lockd = FALSE; + if (modfind("nfslockd") < 0) { + if (kldload("nfslockd") < 0) { + fprintf(stderr, "Can't find or load kernel support for rpc.lockd - using non-kernel implementation\n"); + } + kernel_lockd = TRUE; + } else { + kernel_lockd = TRUE; + } + (void)rpcb_unset(NLM_PROG, NLM_SM, NULL); (void)rpcb_unset(NLM_PROG, NLM_VERS, NULL); (void)rpcb_unset(NLM_PROG, NLM_VERSX, NULL); @@ -743,7 +752,7 @@ void usage() { - errx(1, "usage: rpc.lockd [-k] [-d <debuglevel>]" + errx(1, "usage: rpc.lockd [-d <debuglevel>]" " [-g <grace period>] [-h <bindip>] [-p <port>]"); } ==== //depot/projects/dtrace/src/usr.sbin/rpc.lockd/rpc.lockd.8#7 (text+ko) ==== @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/usr.sbin/rpc.lockd/rpc.lockd.8,v 1.19 2008/03/26 15:23:12 dfr Exp $ +.\" $FreeBSD: src/usr.sbin/rpc.lockd/rpc.lockd.8,v 1.20 2008/03/27 11:54:20 dfr Exp $ .\" .Dd November 2, 2007 .Dt RPC.LOCKD 8 @@ -41,7 +41,6 @@ .Nd NFS file locking daemon .Sh SYNOPSIS .Nm -.Op Fl k .Op Fl d Ar debug_level .Op Fl g Ar grace period .Op Fl h Ar bindip @@ -59,11 +58,6 @@ Options and operands available for .Nm : .Bl -tag -width indent -.It Fl k -The -.Fl k -option specifies the use of the kernel-resident NFS lock manager, if -possible. .It Fl d The .Fl d ==== //depot/projects/dtrace/www/en/releases/6.3R/errata.html#5 (text+ko) ==== @@ -20,7 +20,7 @@ 2008 The FreeBSD Documentation Project</p> <p class="PUBDATE">$FreeBSD: src/release/doc/en_US.ISO8859-1/errata/article.sgml,v -1.73.2.55 2008/03/07 16:42:16 bmah Exp $<br /> +1.73.2.56 2008/03/27 04:55:06 bmah Exp $<br /> </p> <div class="LEGALNOTICE"><a id="TRADEMARKS" name="TRADEMARKS"></a> @@ -95,7 +95,7 @@ <p>[20080204] Contrary to the release notes, ipfwpcap(8) is <span class="emphasis"><i class="EMPHASIS">not</i></span> a feature included in FreeBSD 6.3-RELEASE. It was merged to the 6-STABLE codeline after the release branch was created. This utility will be -incldued subsequent snapshots of 6-STABLE and in 6.4-RELEASE.</p> +included in subsequent snapshots of 6-STABLE and in 6.4-RELEASE.</p> <p>[20080229] The release notes gave an incorrect version number for KDE. The correct version number is 3.5.8.</p> ==== //depot/projects/dtrace/www/share/sgml/news.xml#44 (text+ko) ==== @@ -20,7 +20,7 @@ <news> <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0"> <cvs:keyword name="freebsd"> - $FreeBSD: www/share/sgml/news.xml,v 1.156 2008/03/17 21:21:49 murray Exp $ + $FreeBSD: www/share/sgml/news.xml,v 1.157 2008/03/27 05:02:39 murray Exp $ </cvs:keyword> </cvs:keywords> @@ -31,6 +31,24 @@ <name>3</name> <day> + <name>26</name> + <event> + <title>Now Accepting Student Applications for Google Summer of Code</title> + + <p>The student application period for the Google <a + href="http://code.google.com/summerofcode.html">Summer of + Code 2008</a> program has begun. Please peruse our list + of FreeBSD specific <a + href="&enbase;/projects/summerofcode.html">projects and + potential mentors</a> and prepare your application before + the March 31 deadline. Earlier applications are + encouraged as this provides an opportunity for potential + mentors to work on improving the applications with + students before the deadline.</p> + </event> + </day> + + <day> <name>17</name> <event> <title>Participating in Google Summer of Code</title>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200803272007.m2RK78xx050694>