Date: Fri, 25 Apr 2008 07:18:59 GMT From: John Birrell <jb@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 140582 for review Message-ID: <200804250718.m3P7IxiN091435@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=140582 Change 140582 by jb@freebsd3 on 2008/04/25 07:18:51 IF6 Affected files ... .. //depot/projects/dtrace6/src/gnu/usr.bin/send-pr/categories#2 integrate .. //depot/projects/dtrace6/src/gnu/usr.bin/send-pr/send-pr.1#2 integrate .. //depot/projects/dtrace6/src/lib/libc/gen/Makefile.inc#3 integrate .. //depot/projects/dtrace6/src/lib/libc/gen/__getosreldate.c#1 branch .. //depot/projects/dtrace6/src/lib/libc/gen/lockf.c#2 integrate .. //depot/projects/dtrace6/src/lib/libc/include/libc_private.h#2 integrate .. //depot/projects/dtrace6/src/lib/libc/rpc/svc_vc.c#2 integrate .. //depot/projects/dtrace6/src/lib/libc/sys/Makefile.inc#2 integrate .. //depot/projects/dtrace6/src/lib/libc/sys/fcntl.2#2 integrate .. //depot/projects/dtrace6/src/lib/libc/sys/fcntl.c#1 branch .. //depot/projects/dtrace6/src/lib/libc/xdr/xdr_rec.c#2 integrate .. //depot/projects/dtrace6/src/sys/amd64/conf/GENERIC#3 integrate .. //depot/projects/dtrace6/src/sys/arm/conf/AVILA#2 integrate .. //depot/projects/dtrace6/src/sys/arm/conf/HL200#2 integrate .. //depot/projects/dtrace6/src/sys/arm/conf/IQ31244#2 integrate .. //depot/projects/dtrace6/src/sys/arm/conf/SIMICS#2 integrate .. //depot/projects/dtrace6/src/sys/arm/conf/SKYEYE#2 integrate .. //depot/projects/dtrace6/src/sys/compat/freebsd32/freebsd32_proto.h#4 integrate .. //depot/projects/dtrace6/src/sys/compat/freebsd32/freebsd32_syscall.h#4 integrate .. //depot/projects/dtrace6/src/sys/compat/freebsd32/freebsd32_syscalls.c#4 integrate .. //depot/projects/dtrace6/src/sys/compat/freebsd32/freebsd32_sysent.c#4 integrate .. //depot/projects/dtrace6/src/sys/compat/freebsd32/syscalls.master#4 integrate .. //depot/projects/dtrace6/src/sys/compat/linux/linux_file.c#2 integrate .. //depot/projects/dtrace6/src/sys/compat/svr4/svr4_fcntl.c#2 integrate .. //depot/projects/dtrace6/src/sys/conf/NOTES#3 integrate .. //depot/projects/dtrace6/src/sys/conf/files#5 integrate .. //depot/projects/dtrace6/src/sys/conf/options#2 integrate .. //depot/projects/dtrace6/src/sys/dev/usb/ehci_pci.c#3 integrate .. //depot/projects/dtrace6/src/sys/dev/usb/uhci_pci.c#2 integrate .. //depot/projects/dtrace6/src/sys/fs/msdosfs/msdosfs_vnops.c#2 integrate .. //depot/projects/dtrace6/src/sys/fs/smbfs/smbfs_vnops.c#2 integrate .. //depot/projects/dtrace6/src/sys/i386/conf/GENERIC#3 integrate .. //depot/projects/dtrace6/src/sys/i386/conf/XBOX#2 integrate .. //depot/projects/dtrace6/src/sys/i386/ibcs2/ibcs2_fcntl.c#2 integrate .. //depot/projects/dtrace6/src/sys/ia64/conf/GENERIC#2 integrate .. //depot/projects/dtrace6/src/sys/kern/init_sysent.c#2 integrate .. //depot/projects/dtrace6/src/sys/kern/kern_descrip.c#3 integrate .. //depot/projects/dtrace6/src/sys/kern/kern_lockf.c#2 integrate .. //depot/projects/dtrace6/src/sys/kern/syscalls.c#2 integrate .. //depot/projects/dtrace6/src/sys/kern/syscalls.master#2 integrate .. //depot/projects/dtrace6/src/sys/kern/vnode_if.src#3 integrate .. //depot/projects/dtrace6/src/sys/modules/Makefile#5 integrate .. //depot/projects/dtrace6/src/sys/modules/krpc/Makefile#1 branch .. //depot/projects/dtrace6/src/sys/modules/nfslockd/Makefile#1 branch .. //depot/projects/dtrace6/src/sys/nfs4client/nfs4_vnops.c#2 integrate .. //depot/projects/dtrace6/src/sys/nfsclient/nfs_lock.c#2 integrate .. //depot/projects/dtrace6/src/sys/nfsclient/nfs_vnops.c#3 integrate .. //depot/projects/dtrace6/src/sys/nfsserver/nfs_srvsock.c#2 integrate .. //depot/projects/dtrace6/src/sys/nlm/nlm.h#1 branch .. //depot/projects/dtrace6/src/sys/nlm/nlm_prot.h#1 branch .. //depot/projects/dtrace6/src/sys/nlm/nlm_prot_clnt.c#1 branch .. //depot/projects/dtrace6/src/sys/nlm/nlm_prot_impl.c#1 branch .. //depot/projects/dtrace6/src/sys/nlm/nlm_prot_server.c#1 branch .. //depot/projects/dtrace6/src/sys/nlm/nlm_prot_svc.c#1 branch .. //depot/projects/dtrace6/src/sys/nlm/nlm_prot_xdr.c#1 branch .. //depot/projects/dtrace6/src/sys/nlm/sm_inter.h#1 branch .. //depot/projects/dtrace6/src/sys/nlm/sm_inter_xdr.c#1 branch .. //depot/projects/dtrace6/src/sys/pc98/conf/GENERIC#2 integrate .. //depot/projects/dtrace6/src/sys/pci/if_xl.c#2 integrate .. //depot/projects/dtrace6/src/sys/pci/if_xlreg.h#2 integrate .. //depot/projects/dtrace6/src/sys/powerpc/conf/GENERIC#2 integrate .. //depot/projects/dtrace6/src/sys/rpc/auth.h#1 branch .. //depot/projects/dtrace6/src/sys/rpc/auth_none.c#1 branch .. //depot/projects/dtrace6/src/sys/rpc/auth_unix.c#1 branch .. //depot/projects/dtrace6/src/sys/rpc/authunix_prot.c#1 branch .. //depot/projects/dtrace6/src/sys/rpc/clnt.h#1 branch .. //depot/projects/dtrace6/src/sys/rpc/clnt_dg.c#1 branch .. //depot/projects/dtrace6/src/sys/rpc/clnt_rc.c#1 branch .. //depot/projects/dtrace6/src/sys/rpc/clnt_stat.h#1 branch .. //depot/projects/dtrace6/src/sys/rpc/clnt_vc.c#1 branch .. //depot/projects/dtrace6/src/sys/rpc/getnetconfig.c#1 branch .. //depot/projects/dtrace6/src/sys/rpc/inet_ntop.c#1 branch .. //depot/projects/dtrace6/src/sys/rpc/inet_pton.c#1 branch .. //depot/projects/dtrace6/src/sys/rpc/netconfig.h#1 branch .. //depot/projects/dtrace6/src/sys/rpc/nettype.h#1 branch .. //depot/projects/dtrace6/src/sys/rpc/pmap_prot.h#1 branch .. //depot/projects/dtrace6/src/sys/rpc/rpc.h#1 branch .. //depot/projects/dtrace6/src/sys/rpc/rpc_callmsg.c#1 branch .. //depot/projects/dtrace6/src/sys/rpc/rpc_com.h#1 branch .. //depot/projects/dtrace6/src/sys/rpc/rpc_generic.c#1 branch .. //depot/projects/dtrace6/src/sys/rpc/rpc_msg.h#1 branch .. //depot/projects/dtrace6/src/sys/rpc/rpc_prot.c#1 branch .. //depot/projects/dtrace6/src/sys/rpc/rpcb_clnt.c#1 branch .. //depot/projects/dtrace6/src/sys/rpc/rpcb_clnt.h#1 branch .. //depot/projects/dtrace6/src/sys/rpc/rpcb_prot.c#1 branch .. //depot/projects/dtrace6/src/sys/rpc/rpcb_prot.h#1 branch .. //depot/projects/dtrace6/src/sys/rpc/svc.c#1 branch .. //depot/projects/dtrace6/src/sys/rpc/svc.h#1 branch .. //depot/projects/dtrace6/src/sys/rpc/svc_auth.c#1 branch .. //depot/projects/dtrace6/src/sys/rpc/svc_auth.h#1 branch .. //depot/projects/dtrace6/src/sys/rpc/svc_auth_unix.c#1 branch .. //depot/projects/dtrace6/src/sys/rpc/svc_dg.c#1 branch .. //depot/projects/dtrace6/src/sys/rpc/svc_generic.c#1 branch .. //depot/projects/dtrace6/src/sys/rpc/svc_vc.c#1 branch .. //depot/projects/dtrace6/src/sys/rpc/types.h#1 branch .. //depot/projects/dtrace6/src/sys/rpc/xdr.h#1 branch .. //depot/projects/dtrace6/src/sys/sparc64/conf/GENERIC#3 integrate .. //depot/projects/dtrace6/src/sys/sys/fcntl.h#3 integrate .. //depot/projects/dtrace6/src/sys/sys/hash.h#2 integrate .. //depot/projects/dtrace6/src/sys/sys/lockf.h#2 integrate .. //depot/projects/dtrace6/src/sys/sys/mbuf.h#2 integrate .. //depot/projects/dtrace6/src/sys/sys/param.h#7 integrate .. //depot/projects/dtrace6/src/sys/sys/syscall.h#2 integrate .. //depot/projects/dtrace6/src/sys/sys/syscall.mk#2 integrate .. //depot/projects/dtrace6/src/sys/sys/sysproto.h#2 integrate .. //depot/projects/dtrace6/src/sys/ufs/ufs/ufs_vnops.c#3 integrate .. //depot/projects/dtrace6/src/sys/xdr/xdr.c#1 branch .. //depot/projects/dtrace6/src/sys/xdr/xdr_array.c#1 branch .. //depot/projects/dtrace6/src/sys/xdr/xdr_mbuf.c#1 branch .. //depot/projects/dtrace6/src/sys/xdr/xdr_mem.c#1 branch .. //depot/projects/dtrace6/src/sys/xdr/xdr_reference.c#1 branch .. //depot/projects/dtrace6/src/sys/xdr/xdr_sizeof.c#1 branch .. //depot/projects/dtrace6/src/tools/regression/file/flock/Makefile#1 branch .. //depot/projects/dtrace6/src/tools/regression/file/flock/flock.c#1 branch .. //depot/projects/dtrace6/src/usr.sbin/Makefile#4 integrate .. //depot/projects/dtrace6/src/usr.sbin/adduser/adduser.8#5 integrate .. //depot/projects/dtrace6/src/usr.sbin/clear_locks/Makefile#1 branch .. //depot/projects/dtrace6/src/usr.sbin/clear_locks/clear_locks.8#1 branch .. //depot/projects/dtrace6/src/usr.sbin/clear_locks/clear_locks.c#1 branch .. //depot/projects/dtrace6/src/usr.sbin/pkg_install/info/main.c#3 integrate .. //depot/projects/dtrace6/src/usr.sbin/pkg_install/info/perform.c#3 integrate .. //depot/projects/dtrace6/src/usr.sbin/rpc.lockd/lockd.c#2 integrate .. //depot/projects/dtrace6/src/usr.sbin/rpc.statd/statd.c#2 integrate Differences ... ==== //depot/projects/dtrace6/src/gnu/usr.bin/send-pr/categories#2 (text+ko) ==== @@ -1,7 +1,8 @@ -# $FreeBSD: src/gnu/usr.bin/send-pr/categories,v 1.17.2.1 2006/07/17 10:38:37 ceri Exp $ +# $FreeBSD: src/gnu/usr.bin/send-pr/categories,v 1.17.2.2 2008/04/23 04:01:53 linimon Exp $ advocacy alpha amd64 +arm bin conf docs ==== //depot/projects/dtrace6/src/gnu/usr.bin/send-pr/send-pr.1#2 (text+ko) ==== @@ -22,7 +22,7 @@ .\" .\" --------------------------------------------------------------------------- .\" -.\" $FreeBSD: src/gnu/usr.bin/send-pr/send-pr.1,v 1.18.2.2 2006/10/23 20:59:26 ceri Exp $ +.\" $FreeBSD: src/gnu/usr.bin/send-pr/send-pr.1,v 1.18.2.3 2008/04/23 04:01:53 linimon Exp $ .nh .TH SEND-PR 1 3.113 "October 2006" .SH NAME @@ -191,6 +191,9 @@ .B amd64 AMD64 processor specific problems. .TP +.B arm +ARM processor specific problems. +.TP .B bin Corrections or enhancements to system executables. .TP ==== //depot/projects/dtrace6/src/lib/libc/gen/Makefile.inc#3 (text+ko) ==== @@ -1,10 +1,11 @@ # @(#)Makefile.inc 8.6 (Berkeley) 5/4/95 -# $FreeBSD: src/lib/libc/gen/Makefile.inc,v 1.121.2.2 2007/10/06 03:15:15 scf Exp $ +# $FreeBSD: src/lib/libc/gen/Makefile.inc,v 1.121.2.3 2008/04/24 10:46:16 dfr Exp $ # machine-independent gen sources .PATH: ${.CURDIR}/${MACHINE_ARCH}/gen ${.CURDIR}/gen -SRCS+= __xuname.c _pthread_stubs.c _rand48.c _spinlock_stub.c _thread_init.c \ +SRCS+= __getosreldate.c __xuname.c \ + _pthread_stubs.c _rand48.c _spinlock_stub.c _thread_init.c \ alarm.c arc4random.c assert.c basename.c check_utility_compat.c \ clock.c closedir.c confstr.c \ crypt.c ctermid.c daemon.c devname.c dirname.c disklabel.c \ ==== //depot/projects/dtrace6/src/lib/libc/gen/lockf.c#2 (text+ko) ==== @@ -36,7 +36,7 @@ /* $NetBSD: lockf.c,v 1.1 1997/12/20 20:23:18 kleink Exp $ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/gen/lockf.c,v 1.8 2002/02/01 00:57:29 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/lockf.c,v 1.8.14.1 2008/04/24 10:46:16 dfr Exp $"); #include "namespace.h" #include <errno.h> @@ -74,7 +74,7 @@ fl.l_type = F_WRLCK; if (_fcntl(filedes, F_GETLK, &fl) == -1) return (-1); - if (fl.l_type == F_UNLCK || fl.l_pid == getpid()) + if (fl.l_type == F_UNLCK || (fl.l_sysid == 0 && fl.l_pid == getpid())) return (0); errno = EAGAIN; return (-1); ==== //depot/projects/dtrace6/src/lib/libc/include/libc_private.h#2 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libc/include/libc_private.h,v 1.12 2004/08/15 16:18:03 dfr Exp $ + * $FreeBSD: src/lib/libc/include/libc_private.h,v 1.12.8.1 2008/04/24 10:46:16 dfr Exp $ * * Private definitions for libc, libc_r and libpthread. * @@ -135,4 +135,13 @@ */ extern struct _spinlock *__malloc_lock; +/* + * Get kern.osreldate to detect ABI revisions. Explicitly + * ignores value of $OSVERSION and caches result. + */ +extern int __getosreldate(void); + +/* Without back-compat translation */ +extern int __sys_fcntl(int, int, ...); + #endif /* _LIBC_PRIVATE_H_ */ ==== //depot/projects/dtrace6/src/lib/libc/rpc/svc_vc.c#2 (text+ko) ==== @@ -34,7 +34,7 @@ static char *sccsid = "@(#)svc_tcp.c 2.2 88/08/01 4.0 RPCSRC"; #endif #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/rpc/svc_vc.c,v 1.24 2004/10/16 06:11:35 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/rpc/svc_vc.c,v 1.24.2.1 2008/04/24 10:46:16 dfr Exp $"); /* * svc_vc.c, Server side for Connection Oriented based RPC. @@ -602,10 +602,11 @@ if (cd->nonblock) { if (!__xdrrec_getrec(xdrs, &cd->strm_stat, TRUE)) return FALSE; + } else { + (void)xdrrec_skiprecord(xdrs); } xdrs->x_op = XDR_DECODE; - (void)xdrrec_skiprecord(xdrs); if (xdr_callmsg(xdrs, msg)) { cd->x_id = msg->rm_xid; return (TRUE); ==== //depot/projects/dtrace6/src/lib/libc/sys/Makefile.inc#2 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile.inc 8.3 (Berkeley) 10/24/94 -# $FreeBSD: src/lib/libc/sys/Makefile.inc,v 1.113.2.2 2006/10/16 11:59:08 ru Exp $ +# $FreeBSD: src/lib/libc/sys/Makefile.inc,v 1.113.2.3 2008/04/24 10:46:16 dfr Exp $ # sys sources .PATH: ${.CURDIR}/${MACHINE_ARCH}/sys ${.CURDIR}/sys @@ -19,6 +19,10 @@ # Sources common to both syscall interfaces: SRCS+= ftruncate.c lseek.c mmap.c pread.c pwrite.c truncate.c __error.c +.if !defined(WITHOUT_SYSCALL_COMPAT) +SRCS+= fcntl.c +PSEUDO+= _fcntl.o +.endif # Add machine dependent asm sources: SRCS+=${MDASM} ==== //depot/projects/dtrace6/src/lib/libc/sys/fcntl.2#2 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)fcntl.2 8.2 (Berkeley) 1/12/94 -.\" $FreeBSD: src/lib/libc/sys/fcntl.2,v 1.44 2004/07/02 23:52:13 ru Exp $ +.\" $FreeBSD: src/lib/libc/sys/fcntl.2,v 1.44.8.1 2008/04/24 10:46:16 dfr Exp $ .\" .Dd January 12, 1994 .Dt FCNTL 2 @@ -181,6 +181,7 @@ pid_t l_pid; /* lock owner */ short l_type; /* lock type: read/write, etc. */ short l_whence; /* type of l_start */ + int l_sysid; /* remote system id or zero for local */ }; .Ed The commands available for advisory record locking are as follows: @@ -268,9 +269,13 @@ means end edge of the region. The .Fa l_pid -field is only used with +and +.Fa l_sysid +fields are only used with .Dv F_GETLK -to return the process ID of the process holding a blocking lock. +to return the process ID of the process holding a blocking lock and +the system ID of the system that owns that process. +Locks created by the local system will have a system ID of zero. After a successful .Dv F_GETLK request, the value of ==== //depot/projects/dtrace6/src/lib/libc/xdr/xdr_rec.c#2 (text+ko) ==== @@ -34,7 +34,7 @@ static char *sccsid = "@(#)xdr_rec.c 2.2 88/08/01 4.0 RPCSRC"; #endif #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/xdr/xdr_rec.c,v 1.21 2004/10/16 06:32:43 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/xdr/xdr_rec.c,v 1.21.2.1 2008/04/24 10:46:17 dfr Exp $"); /* * xdr_rec.c, Implements TCP/IP based XDR streams with a "record marking" @@ -574,6 +574,12 @@ rstrm->in_header &= ~LAST_FRAG; rstrm->last_frag = TRUE; } + /* + * We can only reasonably expect to read once from a + * non-blocking stream. Reading the fragment header + * may have drained the stream. + */ + expectdata = FALSE; } n = rstrm->readit(rstrm->tcp_handle, ==== //depot/projects/dtrace6/src/sys/amd64/conf/GENERIC#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/amd64/conf/GENERIC,v 1.439.2.19 2007/12/15 06:03:43 scottl Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.439.2.20 2008/04/24 10:46:17 dfr Exp $ machine amd64 cpu HAMMER @@ -38,6 +38,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/dtrace6/src/sys/arm/conf/AVILA#2 (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.3.2.2 2007/02/27 00:27:50 cognet Exp $ +# $FreeBSD: src/sys/arm/conf/AVILA,v 1.3.2.3 2008/04/24 10:46: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/dtrace6/src/sys/arm/conf/HL200#2 (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.4.1 2007/12/02 14:20:34 cognet Exp $ +# $FreeBSD: src/sys/arm/conf/HL200,v 1.2.4.2 2008/04/24 10:46:17 dfr Exp $ machine arm ident HL200 @@ -49,6 +49,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 BOOTP_NFSROOT options BOOTP ==== //depot/projects/dtrace6/src/sys/arm/conf/IQ31244#2 (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.11.2.2 2007/02/27 00:27:50 cognet Exp $ +# $FreeBSD: src/sys/arm/conf/IQ31244,v 1.11.2.3 2008/04/24 10:46:17 dfr Exp $ machine arm ident IQ31244 @@ -46,6 +46,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/dtrace6/src/sys/arm/conf/SIMICS#2 (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.7.2.1 2006/06/23 16:56:57 cognet Exp $ +# $FreeBSD: src/sys/arm/conf/SIMICS,v 1.7.2.2 2008/04/24 10:46:17 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/dtrace6/src/sys/arm/conf/SKYEYE#2 (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/SKYEYE,v 1.5.2.1 2006/06/23 23:35:35 cognet Exp $ +# $FreeBSD: src/sys/arm/conf/SKYEYE,v 1.5.2.2 2008/04/24 10:46:17 dfr Exp $ machine arm ident KB920X @@ -47,6 +47,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/dtrace6/src/sys/compat/freebsd32/freebsd32_proto.h#4 (text+ko) ==== @@ -2,8 +2,8 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.38.2.15 2007/12/19 23:04:12 jhb Exp $ - * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.50.2.15 2007/12/19 23:03:50 jhb Exp + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.38.2.16 2008/04/24 10:52:29 dfr Exp $ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.50.2.16 2008/04/24 10:46:17 dfr Exp */ #ifndef _FREEBSD32_SYSPROTO_H_ ==== //depot/projects/dtrace6/src/sys/compat/freebsd32/freebsd32_syscall.h#4 (text+ko) ==== @@ -2,8 +2,8 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscall.h,v 1.38.2.15 2007/12/19 23:04:12 jhb Exp $ - * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.50.2.15 2007/12/19 23:03:50 jhb Exp + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscall.h,v 1.38.2.16 2008/04/24 10:52:30 dfr Exp $ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.50.2.16 2008/04/24 10:46:17 dfr Exp */ #define FREEBSD32_SYS_syscall 0 ==== //depot/projects/dtrace6/src/sys/compat/freebsd32/freebsd32_syscalls.c#4 (text+ko) ==== @@ -2,8 +2,8 @@ * System call names. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscalls.c,v 1.29.2.15 2007/12/19 23:04:12 jhb Exp $ - * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.50.2.15 2007/12/19 23:03:50 jhb Exp + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscalls.c,v 1.29.2.16 2008/04/24 10:52:30 dfr Exp $ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.50.2.16 2008/04/24 10:46:17 dfr Exp */ const char *freebsd32_syscallnames[] = { @@ -161,7 +161,7 @@ "#151", /* 151 = sem_lock */ "#152", /* 152 = sem_wakeup */ "#153", /* 153 = asyncdaemon */ - "#154", /* 154 = nosys */ + "#154", /* 154 = nlm_syscall */ "#155", /* 155 = nfssvc */ "obs_ogetdirentries", /* 156 = obsolete ogetdirentries */ "old.freebsd32_statfs", /* 157 = old freebsd32_statfs */ ==== //depot/projects/dtrace6/src/sys/compat/freebsd32/freebsd32_sysent.c#4 (text+ko) ==== @@ -2,8 +2,8 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.39.2.15 2007/12/19 23:04:12 jhb Exp $ - * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.50.2.15 2007/12/19 23:03:50 jhb Exp + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.39.2.16 2008/04/24 10:52:30 dfr Exp $ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.50.2.16 2008/04/24 10:46:17 dfr Exp */ #include "opt_compat.h" @@ -187,7 +187,7 @@ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 151 = sem_lock */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 152 = sem_wakeup */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 153 = asyncdaemon */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 154 = nosys */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 154 = nlm_syscall */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 155 = nfssvc */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 156 = obsolete ogetdirentries */ { compat4(SYF_MPSAFE | AS(freebsd4_freebsd32_statfs_args),freebsd32_statfs), AUE_STATFS }, /* 157 = old freebsd32_statfs */ ==== //depot/projects/dtrace6/src/sys/compat/freebsd32/syscalls.master#4 (text+ko) ==== @@ -1,4 +1,4 @@ - $FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.50.2.15 2007/12/19 23:03:50 jhb Exp $ + $FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.50.2.16 2008/04/24 10:46:17 dfr Exp $ ; from: @(#)syscalls.master 8.2 (Berkeley) 1/13/94 ; from: src/sys/kern/syscalls.master 1.107 ; @@ -279,7 +279,8 @@ 151 AUE_NULL UNIMPL sem_lock (BSD/OS 2.x) 152 AUE_NULL UNIMPL sem_wakeup (BSD/OS 2.x) 153 AUE_NULL UNIMPL asyncdaemon (BSD/OS 2.x) -154 AUE_NULL UNIMPL nosys +; 154 is initialised by the NLM code, if present. +154 AUE_NULL UNIMPL nlm_syscall ; 155 is initialized by the NFS code, if present. ; XXX this is a problem!!! 155 AUE_NFS_SVC UNIMPL nfssvc ==== //depot/projects/dtrace6/src/sys/compat/linux/linux_file.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_file.c,v 1.91.2.4 2007/08/29 15:04:25 netchild Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_file.c,v 1.91.2.5 2008/04/24 10:46:18 dfr Exp $"); #include "opt_compat.h" #include "opt_mac.h" @@ -960,6 +960,8 @@ bsd_flock->l_start = (off_t)linux_flock->l_start; bsd_flock->l_len = (off_t)linux_flock->l_len; bsd_flock->l_pid = (pid_t)linux_flock->l_pid; + bsd_flock->l_sysid = 0; + bsd_flock->l_sysid = 0; } static void ==== //depot/projects/dtrace6/src/sys/compat/svr4/svr4_fcntl.c#2 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_fcntl.c,v 1.35 2005/02/07 21:53:41 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_fcntl.c,v 1.35.2.1 2008/04/24 10:46:18 dfr Exp $"); #include "opt_mac.h" @@ -189,7 +189,7 @@ oflp->l_start = (off_t) iflp->l_start; oflp->l_len = (off_t) iflp->l_len; oflp->l_pid = (pid_t) iflp->l_pid; - + oflp->l_sysid = iflp->l_sysid; } static void @@ -215,7 +215,7 @@ oflp->l_whence = (short) iflp->l_whence; oflp->l_start = (svr4_off64_t) iflp->l_start; oflp->l_len = (svr4_off64_t) iflp->l_len; - oflp->l_sysid = 0; + oflp->l_sysid = iflp->l_sysid; oflp->l_pid = (svr4_pid_t) iflp->l_pid; } ==== //depot/projects/dtrace6/src/sys/conf/NOTES#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1325.2.39 2008/03/12 11:33:06 rwatson Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1325.2.40 2008/04/24 10:46:18 dfr Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -881,6 +881,8 @@ options HPFS #OS/2 File system options MSDOSFS #MS DOS File System (FAT, FAT32) options NFSSERVER #Network File System server +# XXX don't build NFSLOCKD since it conflicts with ATM_SPANS +#options NFSLOCKD #Network Lock Manager options NTFS #NT File System options NULLFS #NULL filesystem # Broken (depends on NCP): ==== //depot/projects/dtrace6/src/sys/conf/files#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1031.2.72 2008/03/19 01:11:38 yongari Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1031.2.73 2008/04/24 10:46:18 dfr Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -1893,6 +1893,12 @@ nfsserver/nfs_srvcache.c optional nfsserver nfsserver/nfs_srvsubs.c optional nfsserver nfsserver/nfs_syscalls.c optional nfsserver +nlm/nlm_prot_clnt.c optional nfslockd +nlm/nlm_prot_impl.c optional nfslockd +nlm/nlm_prot_server.c optional nfslockd +nlm/nlm_prot_svc.c optional nfslockd +nlm/nlm_prot_xdr.c optional nfslockd +nlm/sm_inter_xdr.c optional nfslockd # crypto support opencrypto/cast.c optional crypto opencrypto/cast.c optional ipsec ipsec_esp @@ -1932,7 +1938,27 @@ posix4/ksched.c optional _kposix_priority_scheduling posix4/p1003_1b.c standard posix4/posix4_mib.c standard +rpc/auth_none.c optional nfslockd +rpc/auth_unix.c optional nfslockd +rpc/authunix_prot.c optional nfslockd +rpc/clnt_dg.c optional nfslockd +rpc/clnt_rc.c optional nfslockd +rpc/clnt_vc.c optional nfslockd +rpc/getnetconfig.c optional nfslockd +rpc/inet_ntop.c optional nfslockd +rpc/inet_pton.c optional nfslockd +rpc/rpc_callmsg.c optional nfslockd +rpc/rpc_generic.c optional nfslockd +rpc/rpc_prot.c optional nfslockd +rpc/rpcb_clnt.c optional nfslockd +rpc/rpcb_prot.c optional nfslockd rpc/rpcclnt.c optional nfsclient +rpc/svc.c optional nfslockd +rpc/svc_auth.c optional nfslockd +rpc/svc_auth_unix.c optional nfslockd +rpc/svc_dg.c optional nfslockd +rpc/svc_generic.c optional nfslockd +rpc/svc_vc.c optional nfslockd security/audit/audit.c optional audit security/audit/audit_arg.c optional audit security/audit/audit_bsm.c optional audit @@ -2007,3 +2033,9 @@ vm/vm_unix.c standard vm/vm_zeroidle.c standard vm/vnode_pager.c standard +xdr/xdr.c optional nfslockd +xdr/xdr_array.c optional nfslockd +xdr/xdr_mbuf.c optional nfslockd +xdr/xdr_mem.c optional nfslockd +xdr/xdr_reference.c optional nfslockd +xdr/xdr_sizeof.c optional nfslockd ==== //depot/projects/dtrace6/src/sys/conf/options#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.510.2.23 2007/09/14 22:44:37 obrien Exp $ +# $FreeBSD: src/sys/conf/options,v 1.510.2.24 2008/04/24 10:46:18 dfr Exp $ # # On the handling of kernel options # @@ -389,6 +389,8 @@ TCP_SACK_DEBUG opt_tcp_sack.h TCP_DROP_SYNFIN opt_tcp_input.h XBONEHACK +KRPC +NFSLOCKD # Netgraph(4). Use option NETGRAPH to enable the base netgraph code. # Each netgraph node type can be either be compiled into the kernel ==== //depot/projects/dtrace6/src/sys/dev/usb/ehci_pci.c#3 (text+ko) ==== @@ -36,7 +36,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/usb/ehci_pci.c,v 1.18.2.3 2008/03/19 16:39:07 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/ehci_pci.c,v 1.18.2.4 2008/04/23 18:54:51 jhb Exp $"); /* * USB Enhanced Host Controller Driver, a.k.a. USB 2.0 controller. @@ -115,6 +115,10 @@ static const char *ehci_device_ich6 = "Intel 82801FB (ICH6) USB 2.0 controller"; #define PCI_EHCI_DEVICEID_ICH7 0x27cc8086 static const char *ehci_device_ich7 = "Intel 82801GB/R (ICH7) USB 2.0 controller"; +#define PCI_EHCI_DEVICEID_ICH8_A 0x28368086 +static const char *ehci_device_ich8_a = "Intel 82801H (ICH8) USB 2.0 controller USB2-A"; +#define PCI_EHCI_DEVICEID_ICH8_B 0x283a8086 +static const char *ehci_device_ich8_b = "Intel 82801H (ICH8) USB 2.0 controller USB2-B"; /* NEC */ #define PCI_EHCI_DEVICEID_NEC 0x00e01033 @@ -224,6 +228,10 @@ return (ehci_device_ich6); case PCI_EHCI_DEVICEID_ICH7: return (ehci_device_ich7); + case PCI_EHCI_DEVICEID_ICH8_A: + return (ehci_device_ich8_a); + case PCI_EHCI_DEVICEID_ICH8_B: + return (ehci_device_ich8_b); case PCI_EHCI_DEVICEID_NEC: return (ehci_device_nec); case PCI_EHCI_DEVICEID_NF2: ==== //depot/projects/dtrace6/src/sys/dev/usb/uhci_pci.c#2 (text+ko) ==== @@ -36,7 +36,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/usb/uhci_pci.c,v 1.57 2005/03/01 07:50:11 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/uhci_pci.c,v 1.57.2.1 2008/04/23 18:54:51 jhb Exp $"); /* Universal Host Controller Interface * @@ -139,6 +139,21 @@ #define PCI_UHCI_DEVICEID_ICH6_D 0x265b8086 static const char *uhci_device_ich6_d = "Intel 82801FB/FR/FW/FRW (ICH6) USB controller USB-D"; +#define PCI_UHCI_DEVICEID_ICH8_A 0x28308086 +static const char *uhci_device_ich8_a = "Intel 82801H (ICH8) USB controller USB-A"; + +#define PCI_UHCI_DEVICEID_ICH8_B 0x28318086 +static const char *uhci_device_ich8_b = "Intel 82801H (ICH8) USB controller USB-B"; + +#define PCI_UHCI_DEVICEID_ICH8_C 0x28328086 +static const char *uhci_device_ich8_c = "Intel 82801H (ICH8) USB controller USB-C"; + +#define PCI_UHCI_DEVICEID_ICH8_D 0x28348086 +static const char *uhci_device_ich8_d = "Intel 82801H (ICH8) USB controller USB-D"; + +#define PCI_UHCI_DEVICEID_ICH8_E 0x28358086 +static const char *uhci_device_ich8_e = "Intel 82801H (ICH8) USB controller USB-E"; + #define PCI_UHCI_DEVICEID_440MX 0x719a8086 static const char *uhci_device_440mx = "Intel 82443MX USB controller"; @@ -231,6 +246,16 @@ return (uhci_device_ich6_c); } else if (device_id == PCI_UHCI_DEVICEID_ICH6_D) { return (uhci_device_ich6_d); + } else if (device_id == PCI_UHCI_DEVICEID_ICH8_A) { + return (uhci_device_ich8_a); + } else if (device_id == PCI_UHCI_DEVICEID_ICH8_B) { + return (uhci_device_ich8_b); + } else if (device_id == PCI_UHCI_DEVICEID_ICH8_C) { + return (uhci_device_ich8_c); + } else if (device_id == PCI_UHCI_DEVICEID_ICH8_D) { + return (uhci_device_ich8_d); + } else if (device_id == PCI_UHCI_DEVICEID_ICH8_E) { + return (uhci_device_ich8_e); } else if (device_id == PCI_UHCI_DEVICEID_440MX) { return (uhci_device_440mx); } else if (device_id == PCI_UHCI_DEVICEID_460GX) { ==== //depot/projects/dtrace6/src/sys/fs/msdosfs/msdosfs_vnops.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/fs/msdosfs/msdosfs_vnops.c,v 1.160.2.4 2007/07/08 15:30:27 rodrigc Exp $ */ +/* $FreeBSD: src/sys/fs/msdosfs/msdosfs_vnops.c,v 1.160.2.5 2008/04/24 10:46:18 dfr Exp $ */ /* $NetBSD: msdosfs_vnops.c,v 1.68 1998/02/10 14:10:04 mrg Exp $ */ /*- @@ -84,6 +84,7 @@ * Prototypes for MSDOSFS vnode operations */ static vop_advlock_t msdosfs_advlock; +static vop_advlockasync_t msdosfs_advlockasync; static vop_create_t msdosfs_create; static vop_mknod_t msdosfs_mknod; static vop_open_t msdosfs_open; @@ -1889,12 +1890,29 @@ return (lf_advlock(ap, &dep->de_lockf, dep->de_FileSize)); } +static int +msdosfs_advlockasync(ap) + struct vop_advlockasync_args /* { + struct vnode *a_vp; + u_char a_id; + int a_op; + struct flock *a_fl; + int a_flags; + struct task *a_task; + } */ *ap; +{ + struct denode *dep = VTODE(ap->a_vp); + + return (lf_advlockasync(ap, &dep->de_lockf, dep->de_FileSize)); +} + /* Global vfs data structures for msdosfs */ struct vop_vector msdosfs_vnodeops = { .vop_default = &default_vnodeops, .vop_access = msdosfs_access, .vop_advlock = msdosfs_advlock, + .vop_advlockasync = msdosfs_advlockasync, .vop_bmap = msdosfs_bmap, .vop_cachedlookup = msdosfs_lookup, .vop_open = msdosfs_open, ==== //depot/projects/dtrace6/src/sys/fs/smbfs/smbfs_vnops.c#2 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/fs/smbfs/smbfs_vnops.c,v 1.61.2.2 2006/05/31 22:31:21 cperciva Exp $ + * $FreeBSD: src/sys/fs/smbfs/smbfs_vnops.c,v 1.61.2.3 2008/04/24 10:46:18 dfr Exp $ */ #include <sys/param.h> #include <sys/systm.h> @@ -998,8 +998,11 @@ lkop = SMB_LOCK_EXCL; error = smbfs_smb_lock(np, lkop, id, start, end, &scred); if (error) { + int oldtype = fl->l_type; + fl->l_type = F_UNLCK; ap->a_op = F_UNLCK; lf_advlock(ap, &np->n_lockf, size); + fl->l_type = oldtype; } break; case F_UNLCK: ==== //depot/projects/dtrace6/src/sys/i386/conf/GENERIC#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/i386/conf/GENERIC,v 1.429.2.15 2007/12/15 06:03:43 scottl Exp $ +# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.429.2.17 2008/04/24 13:08:30 dfr Exp $ machine i386 cpu I486_CPU @@ -40,6 +40,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/dtrace6/src/sys/i386/conf/XBOX#2 (text+ko) ==== @@ -1,7 +1,7 @@ # # XBOX -- kernel for an XBOX # -# $FreeBSD: src/sys/i386/conf/XBOX,v 1.7.2.1 2006/08/23 16:28:03 rink Exp $ +# $FreeBSD: src/sys/i386/conf/XBOX,v 1.7.2.2 2008/04/24 10:46:19 dfr Exp $ machine i386 cpu I686_CPU # Celeron ident XBOX @@ -30,6 +30,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/dtrace6/src/sys/i386/ibcs2/ibcs2_fcntl.c#2 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/i386/ibcs2/ibcs2_fcntl.c,v 1.28 2005/02/07 22:02:18 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/ibcs2/ibcs2_fcntl.c,v 1.28.2.1 2008/04/24 10:46:19 dfr Exp $"); #include "opt_spx_hack.h" @@ -93,7 +93,7 @@ iflp->l_whence = (short)flp->l_whence; iflp->l_start = (ibcs2_off_t)flp->l_start; iflp->l_len = (ibcs2_off_t)flp->l_len; - iflp->l_sysid = 0; + iflp->l_sysid = flp->l_sysid; iflp->l_pid = (ibcs2_pid_t)flp->l_pid; } @@ -127,6 +127,7 @@ break; } flp->l_whence = iflp->l_whence; + flp->l_sysid = iflp->l_sysid; } /* convert iBCS2 mode into NetBSD mode */ ==== //depot/projects/dtrace6/src/sys/ia64/conf/GENERIC#2 (text+ko) ==== @@ -18,7 +18,7 @@ # # For hardware specific information check HARDWARE.TXT # -# $FreeBSD: src/sys/ia64/conf/GENERIC,v 1.72.2.3 2006/10/09 18:41:36 simon Exp $ +# $FreeBSD: src/sys/ia64/conf/GENERIC,v 1.72.2.4 2008/04/24 10:46:19 dfr Exp $ machine ia64 cpu ITANIUM @@ -40,6 +40,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/dtrace6/src/sys/kern/init_sysent.c#2 (text+ko) ==== @@ -2,8 +2,8 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/kern/init_sysent.c,v 1.195.2.5 2006/10/10 13:47:59 rwatson Exp $ - * created from FreeBSD: src/sys/kern/syscalls.master,v 1.198.2.5 2006/10/10 13:19:47 rwatson Exp + * $FreeBSD: src/sys/kern/init_sysent.c,v 1.195.2.6 2008/04/24 10:52:30 dfr Exp $ + * created from FreeBSD: src/sys/kern/syscalls.master,v 1.198.2.6 2008/04/24 10:46:19 dfr Exp */ #include "opt_compat.h" @@ -183,7 +183,7 @@ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 151 = sem_lock */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 152 = sem_wakeup */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 153 = asyncdaemon */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 154 = nosys */ + { SYF_MPSAFE | AS(nlm_syscall_args), (sy_call_t *)lkmressys, AUE_NULL }, /* 154 = nlm_syscall */ { SYF_MPSAFE | AS(nfssvc_args), (sy_call_t *)nosys, AUE_NULL }, /* 155 = nfssvc */ { compat(AS(ogetdirentries_args),getdirentries), AUE_GETDIRENTRIES }, /* 156 = old getdirentries */ { compat4(SYF_MPSAFE | AS(freebsd4_statfs_args),statfs), AUE_STATFS }, /* 157 = old statfs */ ==== //depot/projects/dtrace6/src/sys/kern/kern_descrip.c#3 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/kern/kern_descrip.c,v 1.279.2.16 2008/02/14 11:46:08 simon Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_descrip.c,v 1.279.2.17 2008/04/24 10:46:19 dfr Exp $"); #include "opt_compat.h" #include "opt_ddb.h" @@ -321,28 +321,67 @@ fcntl(struct thread *td, struct fcntl_args *uap) { struct flock fl; + struct oflock ofl; intptr_t arg; int error; + int cmd; error = 0; + cmd = uap->cmd; switch (uap->cmd) { - case F_GETLK: - case F_SETLK: - case F_SETLKW: - error = copyin((void *)(intptr_t)uap->arg, &fl, sizeof(fl)); + case F_OGETLK: + case F_OSETLK: + case F_OSETLKW: + /* + * Convert old flock structure to new. + */ + error = copyin((void *)(intptr_t)uap->arg, &ofl, sizeof(ofl)); + fl.l_start = ofl.l_start; >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200804250718.m3P7IxiN091435>