Date: Thu, 3 Mar 2011 17:26:47 GMT From: Edward Tomasz Napierala <trasz@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 189448 for review Message-ID: <201103031726.p23HQl42047559@skunkworks.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://p4web.freebsd.org/@@189448?ac=10 Change 189448 by trasz@trasz_victim on 2011/03/03 17:25:59 IFC. (New ZFS, yay!) Affected files ... .. //depot/projects/soc2009/trasz_limits/MAINTAINERS#9 integrate .. //depot/projects/soc2009/trasz_limits/Makefile#14 integrate .. //depot/projects/soc2009/trasz_limits/Makefile.inc1#22 integrate .. //depot/projects/soc2009/trasz_limits/bin/kill/kill.c#6 integrate .. //depot/projects/soc2009/trasz_limits/cddl/compat/opensolaris/include/fcntl.h#2 integrate .. //depot/projects/soc2009/trasz_limits/cddl/compat/opensolaris/include/mnttab.h#3 integrate .. //depot/projects/soc2009/trasz_limits/cddl/compat/opensolaris/include/priv.h#2 integrate .. //depot/projects/soc2009/trasz_limits/cddl/compat/opensolaris/include/sha2.h#1 branch .. //depot/projects/soc2009/trasz_limits/cddl/compat/opensolaris/include/solaris.h#2 integrate .. //depot/projects/soc2009/trasz_limits/cddl/compat/opensolaris/include/thread_pool.h#1 branch .. //depot/projects/soc2009/trasz_limits/cddl/compat/opensolaris/misc/fsshare.c#3 integrate .. //depot/projects/soc2009/trasz_limits/cddl/compat/opensolaris/misc/zmount.c#2 integrate .. //depot/projects/soc2009/trasz_limits/cddl/contrib/opensolaris/cmd/stat/common/statcommon.h#1 branch .. //depot/projects/soc2009/trasz_limits/cddl/contrib/opensolaris/cmd/stat/common/timestamp.c#1 branch .. //depot/projects/soc2009/trasz_limits/cddl/contrib/opensolaris/cmd/zdb/zdb.c#6 integrate .. //depot/projects/soc2009/trasz_limits/cddl/contrib/opensolaris/cmd/zdb/zdb_il.c#4 integrate .. //depot/projects/soc2009/trasz_limits/cddl/contrib/opensolaris/cmd/zfs/zfs.8#5 integrate .. //depot/projects/soc2009/trasz_limits/cddl/contrib/opensolaris/cmd/zfs/zfs_iter.c#3 integrate .. //depot/projects/soc2009/trasz_limits/cddl/contrib/opensolaris/cmd/zfs/zfs_iter.h#3 integrate .. //depot/projects/soc2009/trasz_limits/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c#7 integrate .. //depot/projects/soc2009/trasz_limits/cddl/contrib/opensolaris/cmd/zfs/zfs_util.h#2 integrate .. //depot/projects/soc2009/trasz_limits/cddl/contrib/opensolaris/cmd/zinject/translate.c#2 integrate .. //depot/projects/soc2009/trasz_limits/cddl/contrib/opensolaris/cmd/zinject/zinject.c#3 integrate .. //depot/projects/soc2009/trasz_limits/cddl/contrib/opensolaris/cmd/zinject/zinject.h#2 integrate .. //depot/projects/soc2009/trasz_limits/cddl/contrib/opensolaris/cmd/zlook/zlook.c#1 branch .. //depot/projects/soc2009/trasz_limits/cddl/contrib/opensolaris/cmd/zpool/zpool.8#3 integrate .. //depot/projects/soc2009/trasz_limits/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c#7 integrate .. //depot/projects/soc2009/trasz_limits/cddl/contrib/opensolaris/cmd/zpool/zpool_util.c#2 integrate .. //depot/projects/soc2009/trasz_limits/cddl/contrib/opensolaris/cmd/zpool/zpool_util.h#2 integrate .. //depot/projects/soc2009/trasz_limits/cddl/contrib/opensolaris/cmd/zpool/zpool_vdev.c#2 integrate .. //depot/projects/soc2009/trasz_limits/cddl/contrib/opensolaris/cmd/zstreamdump/zstreamdump.1#1 branch .. //depot/projects/soc2009/trasz_limits/cddl/contrib/opensolaris/cmd/zstreamdump/zstreamdump.c#1 branch .. //depot/projects/soc2009/trasz_limits/cddl/contrib/opensolaris/cmd/ztest/ztest.c#5 integrate .. //depot/projects/soc2009/trasz_limits/cddl/contrib/opensolaris/head/synch.h#2 integrate .. //depot/projects/soc2009/trasz_limits/cddl/contrib/opensolaris/lib/libnvpair/libnvpair.c#2 integrate .. //depot/projects/soc2009/trasz_limits/cddl/contrib/opensolaris/lib/libnvpair/libnvpair.h#2 integrate .. //depot/projects/soc2009/trasz_limits/cddl/contrib/opensolaris/lib/libuutil/common/libuutil.h#2 integrate .. //depot/projects/soc2009/trasz_limits/cddl/contrib/opensolaris/lib/libuutil/common/uu_alloc.c#2 integrate .. //depot/projects/soc2009/trasz_limits/cddl/contrib/opensolaris/lib/libuutil/common/uu_misc.c#2 integrate .. //depot/projects/soc2009/trasz_limits/cddl/contrib/opensolaris/lib/libuutil/common/uu_string.c#1 branch .. //depot/projects/soc2009/trasz_limits/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h#7 integrate .. //depot/projects/soc2009/trasz_limits/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_changelist.c#3 integrate .. //depot/projects/soc2009/trasz_limits/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_config.c#2 integrate .. //depot/projects/soc2009/trasz_limits/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c#8 integrate .. //depot/projects/soc2009/trasz_limits/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_diff.c#1 branch .. //depot/projects/soc2009/trasz_limits/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_fru.c#1 branch .. //depot/projects/soc2009/trasz_limits/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_impl.h#4 integrate .. //depot/projects/soc2009/trasz_limits/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c#2 integrate .. //depot/projects/soc2009/trasz_limits/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_mount.c#5 integrate .. //depot/projects/soc2009/trasz_limits/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c#6 integrate .. //depot/projects/soc2009/trasz_limits/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c#5 integrate .. //depot/projects/soc2009/trasz_limits/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_status.c#2 integrate .. //depot/projects/soc2009/trasz_limits/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_util.c#4 integrate .. //depot/projects/soc2009/trasz_limits/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c#6 integrate .. //depot/projects/soc2009/trasz_limits/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h#6 integrate .. //depot/projects/soc2009/trasz_limits/cddl/contrib/opensolaris/lib/libzpool/common/taskq.c#4 integrate .. //depot/projects/soc2009/trasz_limits/cddl/contrib/opensolaris/lib/libzpool/common/util.c#2 integrate .. //depot/projects/soc2009/trasz_limits/cddl/contrib/opensolaris/lib/pyzfs/common/__init__.py#2 integrate .. //depot/projects/soc2009/trasz_limits/cddl/contrib/opensolaris/lib/pyzfs/common/allow.py#2 integrate .. //depot/projects/soc2009/trasz_limits/cddl/contrib/opensolaris/lib/pyzfs/common/dataset.py#2 integrate .. //depot/projects/soc2009/trasz_limits/cddl/contrib/opensolaris/lib/pyzfs/common/groupspace.py#2 integrate .. //depot/projects/soc2009/trasz_limits/cddl/contrib/opensolaris/lib/pyzfs/common/holds.py#1 branch .. //depot/projects/soc2009/trasz_limits/cddl/contrib/opensolaris/lib/pyzfs/common/ioctl.c#3 integrate .. //depot/projects/soc2009/trasz_limits/cddl/contrib/opensolaris/lib/pyzfs/common/table.py#1 branch .. //depot/projects/soc2009/trasz_limits/cddl/contrib/opensolaris/lib/pyzfs/common/unallow.py#2 integrate .. //depot/projects/soc2009/trasz_limits/cddl/contrib/opensolaris/lib/pyzfs/common/userspace.py#2 integrate .. //depot/projects/soc2009/trasz_limits/cddl/contrib/opensolaris/lib/pyzfs/common/util.py#2 integrate .. //depot/projects/soc2009/trasz_limits/cddl/lib/libzfs/Makefile#3 integrate .. //depot/projects/soc2009/trasz_limits/cddl/lib/libzpool/Makefile#5 integrate .. //depot/projects/soc2009/trasz_limits/cddl/sbin/zfs/Makefile#3 integrate .. //depot/projects/soc2009/trasz_limits/cddl/sbin/zpool/Makefile#3 integrate .. //depot/projects/soc2009/trasz_limits/cddl/usr.bin/Makefile#2 integrate .. //depot/projects/soc2009/trasz_limits/cddl/usr.bin/zlook/Makefile#1 branch .. //depot/projects/soc2009/trasz_limits/cddl/usr.bin/zstreamdump/Makefile#1 branch .. //depot/projects/soc2009/trasz_limits/cddl/usr.bin/ztest/Makefile#3 integrate .. //depot/projects/soc2009/trasz_limits/cddl/usr.sbin/zdb/Makefile#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/groff/tmac/doc.tmac#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/tzdata/northamerica#5 integrate .. //depot/projects/soc2009/trasz_limits/contrib/tzdata/zone.tab#6 integrate .. //depot/projects/soc2009/trasz_limits/etc/rc.d/zvol#3 integrate .. //depot/projects/soc2009/trasz_limits/games/Makefile.inc#3 integrate .. //depot/projects/soc2009/trasz_limits/lib/libc/gen/errlst.c#3 integrate .. //depot/projects/soc2009/trasz_limits/lib/libc/stdlib/Makefile.inc#5 integrate .. //depot/projects/soc2009/trasz_limits/lib/libc/sys/Makefile.inc#11 integrate .. //depot/projects/soc2009/trasz_limits/lib/libc/sys/Symbol.map#13 integrate .. //depot/projects/soc2009/trasz_limits/lib/libc/sys/cap_enter.2#1 branch .. //depot/projects/soc2009/trasz_limits/lib/libc/sys/intro.2#5 integrate .. //depot/projects/soc2009/trasz_limits/lib/libc/yp/xdryp.c#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/libelf/elf_cntl.3#3 integrate .. //depot/projects/soc2009/trasz_limits/lib/libelf/libelf_convert.m4#4 integrate .. //depot/projects/soc2009/trasz_limits/lib/libusb/Makefile#6 integrate .. //depot/projects/soc2009/trasz_limits/lib/libusb/libusb.3#12 integrate .. //depot/projects/soc2009/trasz_limits/lib/libusb/libusb10.c#9 integrate .. //depot/projects/soc2009/trasz_limits/lib/libusb/libusb20.3#7 integrate .. //depot/projects/soc2009/trasz_limits/lib/libusb/libusb20.c#9 integrate .. //depot/projects/soc2009/trasz_limits/lib/libusb/libusb20.h#8 integrate .. //depot/projects/soc2009/trasz_limits/lib/libusb/libusb20_int.h#7 integrate .. //depot/projects/soc2009/trasz_limits/lib/libusb/libusb20_ugen20.c#9 integrate .. //depot/projects/soc2009/trasz_limits/release/Makefile#10 integrate .. //depot/projects/soc2009/trasz_limits/release/Makefile.bsdinstall#1 branch .. //depot/projects/soc2009/trasz_limits/release/rc.local#1 branch .. //depot/projects/soc2009/trasz_limits/release/scripts/games-make.sh#2 delete .. //depot/projects/soc2009/trasz_limits/release/scripts/lib32-make.sh#3 delete .. //depot/projects/soc2009/trasz_limits/rescue/rescue/Makefile#9 integrate .. //depot/projects/soc2009/trasz_limits/share/man/man4/ng_netflow.4#3 integrate .. //depot/projects/soc2009/trasz_limits/share/man/man4/ng_one2many.4#2 integrate .. //depot/projects/soc2009/trasz_limits/share/man/man7/security.7#3 integrate .. //depot/projects/soc2009/trasz_limits/share/man/man9/usbdi.9#7 integrate .. //depot/projects/soc2009/trasz_limits/share/timedef/pl_PL.ISO8859-2.src#3 integrate .. //depot/projects/soc2009/trasz_limits/share/timedef/pl_PL.UTF-8.src#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/amd64/amd64/pmap.c#24 integrate .. //depot/projects/soc2009/trasz_limits/sys/amd64/amd64/sys_machdep.c#7 integrate .. //depot/projects/soc2009/trasz_limits/sys/arm/arm/sys_machdep.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/boot/i386/boot2/boot2.c#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/boot/i386/cdboot/cdboot.s#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/boot/i386/gptzfsboot/Makefile#7 integrate .. //depot/projects/soc2009/trasz_limits/sys/boot/i386/zfsboot/Makefile#7 integrate .. //depot/projects/soc2009/trasz_limits/sys/boot/pc98/boot2/boot2.c#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/boot/pc98/cdboot/cdboot.s#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/boot/zfs/zfs.c#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/boot/zfs/zfsimpl.c#9 integrate .. //depot/projects/soc2009/trasz_limits/sys/bsm/audit_errno.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/boot/zfs/fletcher.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/boot/zfs/zfsimpl.h#8 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/boot/zfs/zfssubr.c#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/boot/zfs/zle.c#1 branch .. //depot/projects/soc2009/trasz_limits/sys/cddl/compat/opensolaris/kern/opensolaris_atomic.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/compat/opensolaris/kern/opensolaris_kmem.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/compat/opensolaris/kern/opensolaris_misc.c#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/compat/opensolaris/kern/opensolaris_policy.c#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/compat/opensolaris/kern/opensolaris_string.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/compat/opensolaris/kern/opensolaris_sunddi.c#1 branch .. //depot/projects/soc2009/trasz_limits/sys/cddl/compat/opensolaris/kern/opensolaris_sysevent.c#1 branch .. //depot/projects/soc2009/trasz_limits/sys/cddl/compat/opensolaris/kern/opensolaris_taskq.c#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/compat/opensolaris/kern/opensolaris_vfs.c#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/compat/opensolaris/kern/opensolaris_zone.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/compat/opensolaris/sys/atomic.h#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/compat/opensolaris/sys/byteorder.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/compat/opensolaris/sys/dirent.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/compat/opensolaris/sys/file.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/compat/opensolaris/sys/kmem.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/compat/opensolaris/sys/misc.h#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/compat/opensolaris/sys/mount.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/compat/opensolaris/sys/mutex.h#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/compat/opensolaris/sys/policy.h#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/compat/opensolaris/sys/proc.h#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/compat/opensolaris/sys/rwlock.h#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/compat/opensolaris/sys/sid.h#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/compat/opensolaris/sys/stat.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/compat/opensolaris/sys/string.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/compat/opensolaris/sys/sunddi.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/compat/opensolaris/sys/sysmacros.h#3 delete .. //depot/projects/soc2009/trasz_limits/sys/cddl/compat/opensolaris/sys/systeminfo.h#1 branch .. //depot/projects/soc2009/trasz_limits/sys/cddl/compat/opensolaris/sys/systm.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/compat/opensolaris/sys/taskq.h#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/compat/opensolaris/sys/time.h#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/compat/opensolaris/sys/types.h#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/compat/opensolaris/sys/uio.h#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/compat/opensolaris/sys/vfs.h#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/compat/opensolaris/sys/vnode.h#7 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/compat/opensolaris/sys/zone.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/common/acl/acl_common.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/common/acl/acl_common.h#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/common/atomic/amd64/opensolaris_atomic.S#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/common/atomic/i386/opensolaris_atomic.S#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/common/atomic/ia64/opensolaris_atomic.S#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/common/atomic/powerpc64/opensolaris_atomic.S#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/common/atomic/sparc64/opensolaris_atomic.S#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/common/avl/avl.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/common/nvpair/nvpair.c#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/common/unicode/u8_textprep.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/common/zfs/zfs_comutil.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/common/zfs/zfs_comutil.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/common/zfs/zfs_deleg.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/common/zfs/zfs_deleg.h#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/common/zfs/zfs_fletcher.c#1 branch .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/common/zfs/zfs_fletcher.h#1 branch .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/common/zfs/zfs_ioctl_compat.c#1 branch .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/common/zfs/zfs_ioctl_compat.h#1 branch .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/common/zfs/zfs_namecheck.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.c#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/common/zfs/zpool_prop.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/common/zfs/zprop_common.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/Makefile.files#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/gfs.c#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/vnode.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c#17 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/bplist.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/bpobj.c#1 branch .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/ddt.c#1 branch .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/ddt_zap.c#1 branch .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c#8 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_diff.c#1 branch .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_object.c#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c#7 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_zfetch.c#7 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_deadlist.c#1 branch .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_deleg.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_prop.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scan.c#1 branch .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scrub.c#5 delete .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_synctask.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/fletcher.c#3 delete .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/lzjb.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/metaslab.c#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/refcount.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sa.c#1 branch .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sha256.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c#7 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_config.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_errlog.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_history.c#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/space_map.c#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/arc.h#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/bplist.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/bpobj.h#1 branch .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dbuf.h#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/ddt.h#1 branch .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_impl.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_objset.h#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_traverse.h#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_tx.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dnode.h#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dataset.h#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_deadlist.h#1 branch .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_deleg.h#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dir.h#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_pool.h#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_prop.h#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_scan.h#1 branch .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_synctask.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab.h#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab_impl.h#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/refcount.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/sa.h#1 branch .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/sa_impl.h#1 branch .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa_boot.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa_impl.h#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/txg.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/txg_impl.h#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/uberblock.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/uberblock_impl.h#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev.h#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_impl.h#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zap.h#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zap_impl.h#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zap_leaf.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_acl.h#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_context.h#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_debug.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_dir.h#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_fuid.h#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ioctl.h#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_onexit.h#1 branch .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_sa.h#1 branch .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_stat.h#1 branch .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_vfsops.h#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h#8 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zil.h#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zil_impl.h#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h#8 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio_checksum.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio_compress.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio_impl.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zrlock.h#1 branch .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zvol.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/uberblock.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c#7 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_cache.c#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_disk.c#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_file.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#12 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_mirror.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_missing.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_raidz.c#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_root.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap_leaf.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c#10 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_byteswap.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#10 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_debug.c#1 branch .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_fm.c#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_fuid.c#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#13 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_log.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_onexit.c#1 branch .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_rlock.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_sa.c#1 branch .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#19 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#23 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#11 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c#7 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c#10 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio_checksum.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio_compress.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio_inject.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zle.c#1 branch .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zrlock.c#1 branch .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c#7 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/os/callb.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/os/fm.c#1 branch .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/sys/acl.h#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/sys/acl_impl.h#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/sys/avl.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/sys/byteorder.h#2 delete .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/sys/callb.h#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/sys/cpupart.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/sys/cpuvar.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/sys/cred.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/sys/debug.h#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/sys/fm/fs/zfs.h#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/sys/fm/protocol.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/sys/fm/util.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/sys/fs/zfs.h#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/sys/fs/zut.h#1 branch .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/sys/gfs.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/sys/idmap.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/sys/isa_defs.h#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/sys/nvpair.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/sys/processor.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/sys/sysevent.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/sys/sysevent/dev.h#1 branch .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/sys/sysevent/eventdefs.h#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/sys/sysmacros.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/sys/taskq.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/sys/u8_textprep.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/sys/vnode.h#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/compat/freebsd32/freebsd32_proto.h#14 integrate .. //depot/projects/soc2009/trasz_limits/sys/compat/freebsd32/freebsd32_syscall.h#12 integrate .. //depot/projects/soc2009/trasz_limits/sys/compat/freebsd32/freebsd32_syscalls.c#12 integrate .. //depot/projects/soc2009/trasz_limits/sys/compat/freebsd32/freebsd32_sysent.c#13 integrate .. //depot/projects/soc2009/trasz_limits/sys/compat/freebsd32/syscalls.master#16 integrate .. //depot/projects/soc2009/trasz_limits/sys/conf/NOTES#33 integrate .. //depot/projects/soc2009/trasz_limits/sys/conf/files#48 integrate .. //depot/projects/soc2009/trasz_limits/sys/conf/options#30 integrate .. //depot/projects/soc2009/trasz_limits/sys/crypto/aesni/aeskeys_amd64.S#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/crypto/aesni/aeskeys_i386.S#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c#13 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/ath/ath_hal/ar5416/ar5416reg.h#9 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/ath/ath_hal/ar9002/ar9285_attach.c#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/ath/ath_rate/sample/sample.c#7 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/ath/if_ath.c#24 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/ath/if_ath_keycache.c#1 branch .. //depot/projects/soc2009/trasz_limits/sys/dev/ath/if_ath_keycache.h#1 branch .. //depot/projects/soc2009/trasz_limits/sys/dev/ath/if_ath_misc.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/ath/if_ath_sysctl.c#1 branch .. //depot/projects/soc2009/trasz_limits/sys/dev/ath/if_ath_sysctl.h#1 branch .. //depot/projects/soc2009/trasz_limits/sys/dev/ath/if_ath_tx_ht.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/isp/isp.c#10 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/isp/isp_freebsd.c#14 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/isp/isp_freebsd.h#8 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/isp/ispvar.h#7 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/sis/if_sis.c#9 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/sis/if_sisreg.h#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/serial/ulpt.c#11 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/usb_generic.c#13 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/usb_ioctl.h#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/usb_transfer.c#20 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/usbdi.h#7 integrate .. //depot/projects/soc2009/trasz_limits/sys/i386/i386/sys_machdep.c#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/Makefile#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/capabilities.conf#1 branch .. //depot/projects/soc2009/trasz_limits/sys/kern/init_sysent.c#15 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_proc.c#22 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/makesyscalls.sh#7 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/subr_bus.c#20 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/subr_trap.c#13 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/sys_capability.c#1 branch .. //depot/projects/soc2009/trasz_limits/sys/kern/syscalls.c#14 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/syscalls.master#17 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/systrace_args.c#13 integrate .. //depot/projects/soc2009/trasz_limits/sys/mips/include/pmap.h#16 integrate .. //depot/projects/soc2009/trasz_limits/sys/mips/mips/cache_mipsNN.c#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/mips/mips/machdep.c#16 integrate .. //depot/projects/soc2009/trasz_limits/sys/mips/mips/pmap.c#26 integrate .. //depot/projects/soc2009/trasz_limits/sys/mips/mips/swtch.S#10 integrate .. //depot/projects/soc2009/trasz_limits/sys/modules/ath/Makefile#7 integrate .. //depot/projects/soc2009/trasz_limits/sys/modules/netgraph/netflow/Makefile#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/modules/opensolaris/Makefile#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/modules/zfs/Makefile#11 integrate .. //depot/projects/soc2009/trasz_limits/sys/net/if_gif.c#9 integrate .. //depot/projects/soc2009/trasz_limits/sys/net/if_gre.c#7 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/netflow/netflow.c#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/netflow/netflow.h#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/netflow/netflow_v9.c#1 branch .. //depot/projects/soc2009/trasz_limits/sys/netgraph/netflow/netflow_v9.h#1 branch .. //depot/projects/soc2009/trasz_limits/sys/netgraph/netflow/ng_netflow.c#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/netflow/ng_netflow.h#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/ng_one2many.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/ng_one2many.h#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/netinet/sctp.h#11 integrate .. //depot/projects/soc2009/trasz_limits/sys/netinet/sctp_cc_functions.c#13 integrate .. //depot/projects/soc2009/trasz_limits/sys/netinet/sctp_constants.h#12 integrate .. //depot/projects/soc2009/trasz_limits/sys/netinet/sctp_structs.h#14 integrate .. //depot/projects/soc2009/trasz_limits/sys/netinet/sctp_sysctl.c#15 integrate .. //depot/projects/soc2009/trasz_limits/sys/netinet/sctp_sysctl.h#12 integrate .. //depot/projects/soc2009/trasz_limits/sys/netinet/sctp_usrreq.c#18 integrate .. //depot/projects/soc2009/trasz_limits/sys/security/audit/audit_bsm_errno.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/sys/capability.h#1 branch .. //depot/projects/soc2009/trasz_limits/sys/sys/errno.h#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/sys/syscall.h#14 integrate .. //depot/projects/soc2009/trasz_limits/sys/sys/syscall.mk#14 integrate .. //depot/projects/soc2009/trasz_limits/sys/sys/sysent.h#10 integrate .. //depot/projects/soc2009/trasz_limits/sys/sys/sysproto.h#15 integrate .. //depot/projects/soc2009/trasz_limits/sys/sys/ucred.h#13 integrate .. //depot/projects/soc2009/trasz_limits/sys/sys/user.h#9 integrate .. //depot/projects/soc2009/trasz_limits/sys/vm/swap_pager.c#21 integrate .. //depot/projects/soc2009/trasz_limits/sys/vm/vm_map.h#12 integrate .. //depot/projects/soc2009/trasz_limits/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.orthodox#3 integrate .. //depot/projects/soc2009/trasz_limits/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.pagan#2 integrate .. //depot/projects/soc2009/trasz_limits/usr.bin/checknr/checknr.c#3 integrate .. //depot/projects/soc2009/trasz_limits/usr.bin/fstat/zfs.c#4 integrate .. //depot/projects/soc2009/trasz_limits/usr.bin/kdump/Makefile#3 integrate .. //depot/projects/soc2009/trasz_limits/usr.bin/kdump/kdump.c#8 integrate .. //depot/projects/soc2009/trasz_limits/usr.bin/kdump/linux_syscalls.conf#1 branch .. //depot/projects/soc2009/trasz_limits/usr.bin/printf/printf.c#5 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/bsdinstall/scripts/auto#2 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/faithd/faithd.c#3 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/fifolog/fifolog_writer/fifolog_writer.c#4 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/fifolog/flint.lnt#2 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/fifolog/lib/fifolog_create.c#3 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/fifolog/lib/fifolog_int.c#3 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/fifolog/lib/fifolog_write.h#3 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/fifolog/lib/fifolog_write_poll.c#4 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/fifolog/lib/libfifolog.h#2 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/fifolog/lib/libfifolog_int.h#2 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/mountd/mountd.c#7 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/ntp/doc/ntp.conf.5#3 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/rtadvd/rtadvd.c#3 integrate Differences ... ==== //depot/projects/soc2009/trasz_limits/MAINTAINERS#9 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/MAINTAINERS,v 1.162 2010/04/10 12:29:09 bms Exp $ +$FreeBSD: src/MAINTAINERS,v 1.163 2011/02/28 06:54:14 simon Exp $ Please note that the content of this file is strictly advisory. No locks listed here are valid. The only strict review requirements @@ -107,7 +107,7 @@ bs{diff,patch} cperciva Pre-commit review requested. portsnap cperciva Pre-commit review requested. freebsd-update cperciva Pre-commit review requested. -openssl simon Pre-commit review requested. +openssl - No non-upstream commits should be done. sys/netgraph/bluetooth emax Pre-commit review preferred. lib/libbluetooth emax Pre-commit review preferred. lib/libsdp emax Pre-commit review preferred. ==== //depot/projects/soc2009/trasz_limits/Makefile#14 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile,v 1.385 2011/02/10 18:54:52 jhb Exp $ +# $FreeBSD: src/Makefile,v 1.387 2011/03/02 14:39:26 nwhitehorn Exp $ # # The user-driven targets are: # @@ -89,9 +89,11 @@ check-old check-old-dirs check-old-files check-old-libs \ checkdpadd clean cleandepend cleandir \ delete-old delete-old-dirs delete-old-files delete-old-libs \ - depend distribute distributeworld distrib-dirs distribution doxygen \ + depend distribute distributekernel distributekernel.debug \ + distributeworld distrib-dirs distribution doxygen \ everything hierarchy install installcheck installkernel \ - installkernel.debug reinstallkernel reinstallkernel.debug \ + installkernel.debug packagekernel packageworld \ + reinstallkernel reinstallkernel.debug \ installworld kernel-toolchain libraries lint maninstall \ obj objlink regress rerelease showconfig tags toolchain update \ _worldtmp _legacy _bootstrap-tools _cleanobj _obj \ @@ -336,6 +338,7 @@ .else UNIVERSE_TARGET?= buildworld .endif +KERNSRCDIR?= ${.CURDIR}/sys targets: @echo "Supported TARGET/TARGET_ARCH pairs for world and kernel targets" @@ -383,8 +386,8 @@ .endfor .endif .if !defined(MAKE_JUST_WORLDS) -.if exists(${.CURDIR}/sys/${target}/conf/NOTES) - @(cd ${.CURDIR}/sys/${target}/conf && env __MAKE_CONF=/dev/null \ +.if exists(${KERNSRCDIR}/${target}/conf/NOTES) + @(cd ${KERNSRCDIR}/${target}/conf && env __MAKE_CONF=/dev/null \ ${MAKE} LINT > ${.CURDIR}/_.${target}.makeLINT 2>&1 || \ (echo "${target} 'make LINT' failed," \ "check _.${target}.makeLINT for details"| ${MAKEFAIL})) @@ -398,13 +401,13 @@ .if !defined(TARGET) TARGET!= uname -m .endif -KERNCONFS!= cd ${.CURDIR}/sys/${TARGET}/conf && \ +KERNCONFS!= cd ${KERNSRCDIR}/${TARGET}/conf && \ find [A-Z0-9]*[A-Z0-9] -type f -maxdepth 0 \ ! -name DEFAULTS ! -name NOTES universe_kernconfs: .for kernel in ${KERNCONFS} -TARGET_ARCH_${kernel}!= cd ${.CURDIR}/sys/${TARGET}/conf && \ - config -m ${.CURDIR}/sys/${TARGET}/conf/${kernel} 2> /dev/null | \ +TARGET_ARCH_${kernel}!= cd ${KERNSRCDIR}/${TARGET}/conf && \ + config -m ${KERNSRCDIR}/${TARGET}/conf/${kernel} 2> /dev/null | \ grep -v WARNING: | cut -f 2 .if empty(TARGET_ARCH_${kernel}) .error "Target architecture for ${TARGET}/conf/${kernel} unknown. config(8) likely too old." ==== //depot/projects/soc2009/trasz_limits/Makefile.inc1#22 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.685 2011/02/25 00:04:39 gabor Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.688 2011/03/02 14:39:26 nwhitehorn Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -463,36 +463,38 @@ .for _t in obj depend all cd ${.CURDIR}/kerberos5/tools; \ MAKEOBJDIRPREFIX=${OBJTREE}/lib32 ${MAKE} SSP_CFLAGS= DESTDIR= \ - ${_t} + DIRPRFX=kerberos5/tools/ ${_t} .endfor .endif .for _t in obj includes - cd ${.CURDIR}/include; ${LIB32WMAKE} ${_t} - cd ${.CURDIR}/lib; ${LIB32WMAKE} ${_t} + cd ${.CURDIR}/include; ${LIB32WMAKE} DIRPRFX=include/ ${_t} + cd ${.CURDIR}/lib; ${LIB32WMAKE} DIRPRFX=lib/ ${_t} .if ${MK_CDDL} != "no" - cd ${.CURDIR}/cddl/lib; ${LIB32WMAKE} ${_t} + cd ${.CURDIR}/cddl/lib; ${LIB32WMAKE} DIRPRFX=cddl/lib/ ${_t} .endif - cd ${.CURDIR}/gnu/lib; ${LIB32WMAKE} ${_t} + cd ${.CURDIR}/gnu/lib; ${LIB32WMAKE} DIRPRFX=gnu/lib/ ${_t} .if ${MK_CRYPT} != "no" - cd ${.CURDIR}/secure/lib; ${LIB32WMAKE} ${_t} + cd ${.CURDIR}/secure/lib; ${LIB32WMAKE} DIRPRFX=secure/lib/ ${_t} .endif .if ${MK_KERBEROS} != "no" - cd ${.CURDIR}/kerberos5/lib; ${LIB32WMAKE} ${_t} + cd ${.CURDIR}/kerberos5/lib; ${LIB32WMAKE} DIRPRFX=kerberos5/lib ${_t} .endif .endfor .for _dir in usr.bin/lex/lib - cd ${.CURDIR}/${_dir}; ${LIB32WMAKE} obj + cd ${.CURDIR}/${_dir}; ${LIB32WMAKE} DIRPRFX=${_dir}/ obj .endfor .for _dir in lib/ncurses/ncurses lib/ncurses/ncursesw lib/libmagic cd ${.CURDIR}/${_dir}; \ MAKEOBJDIRPREFIX=${OBJTREE}/lib32 ${MAKE} SSP_CFLAGS= DESTDIR= \ - build-tools + DIRPRFX=${_dir}/ build-tools .endfor cd ${.CURDIR}; \ ${LIB32WMAKE} -f Makefile.inc1 libraries .for _t in obj depend all - cd ${.CURDIR}/libexec/rtld-elf; PROG=ld-elf32.so.1 ${LIB32WMAKE} ${_t} - cd ${.CURDIR}/usr.bin/ldd; PROG=ldd32 ${LIB32WMAKE} ${_t} + cd ${.CURDIR}/libexec/rtld-elf; PROG=ld-elf32.so.1 ${LIB32WMAKE} \ + DIRPRFX=libexec/rtld-elf/ ${_t} + cd ${.CURDIR}/usr.bin/ldd; PROG=ldd32 ${LIB32WMAKE} \ + DIRPRFX=usr.bin/ldd ${_t} .endfor distribute32 install32: @@ -629,6 +631,13 @@ # # Installs everything compiled by a 'buildworld'. # + +# Non-base distributions produced by the base system +EXTRA_DISTRIBUTIONS= doc games +.if defined(LIB32TMP) && ${MK_LIB32} != "no" +EXTRA_DISTRIBUTIONS+= lib32 +.endif + distributeworld installworld: installcheck mkdir -p ${INSTALLTMP} progs=$$(for prog in ${ITOOLS}; do \ @@ -651,9 +660,34 @@ done); \ cp $$libs $$progs ${INSTALLTMP} cp -R $${PATH_LOCALE:-"/usr/share/locale"} ${INSTALLTMP}/locale +.if make(distributeworld) +.for dist in ${EXTRA_DISTRIBUTIONS} + -mkdir ${DESTDIR}/${DISTDIR}/${dist} + mtree -deU -f ${.CURDIR}/etc/mtree/BSD.root.dist \ + -p ${DESTDIR}/${DISTDIR}/${dist} >/dev/null + mtree -deU -f ${.CURDIR}/etc/mtree/BSD.usr.dist \ + -p ${DESTDIR}/${DISTDIR}/${dist}/usr >/dev/null + mtree -deU -f ${.CURDIR}/etc/mtree/BSD.include.dist \ + -p ${DESTDIR}/${DISTDIR}/${dist}/usr/include >/dev/null +.endfor + -mkdir ${DESTDIR}/${DISTDIR}/base + ${_+_}cd ${.CURDIR}; ${IMAKE} distrib-dirs \ + DESTDIR=${DESTDIR}/${DISTDIR}/base +.endif ${_+_}cd ${.CURDIR}; ${IMAKE} re${.TARGET:S/world$//}; \ ${IMAKEENV} rm -rf ${INSTALLTMP} +.if make(distributeworld) +.for dist in ${EXTRA_DISTRIBUTIONS} + find ${DESTDIR}/${DISTDIR}/${dist} -empty -delete +.endfor +.endif +packageworld: +.for dist in base ${EXTRA_DISTRIBUTIONS} + ${_+_}cd ${DESTDIR}/${DISTDIR}/${dist}; \ + tar cvJf ${DESTDIR}/${DISTDIR}/${dist}.txz . +.endfor + # # reinstall # @@ -838,6 +872,20 @@ ${CROSSENV} PATH=${TMPPATH} \ ${MAKE} KERNEL=${INSTKERNNAME} ${.TARGET:S/kernel//} +distributekernel distributekernel.debug: +.if empty(INSTALLKERNEL) + @echo "ERROR: No kernel \"${KERNCONF}\" to install."; \ + false +.endif + cd ${KRNLOBJDIR}/${INSTALLKERNEL}; \ + ${CROSSENV} PATH=${TMPPATH} ${MAKE} KERNEL=${INSTKERNNAME} \ + DESTDIR=${DESTDIR}/${DISTDIR}/kernel \ + ${.TARGET:S/distributekernel/install/} + +packagekernel: + ${_+_}cd ${DESTDIR}/${DISTDIR}/kernel; \ + tar cvJf ${DESTDIR}/${DISTDIR}/kernel.txz . + # # doxygen # @@ -1153,6 +1201,7 @@ lib/ncurses/ncurses lib/ncurses/ncursesw \ lib/libopie lib/libpam ${_lib_libthr} \ lib/libradius lib/libsbuf lib/libtacplus \ + ${_cddl_lib_libumem} \ lib/libutil ${_lib_libypclnt} lib/libz lib/msun \ ${_secure_lib_libcrypto} ${_secure_lib_libssh} \ ${_secure_lib_libssl} @@ -1166,6 +1215,7 @@ lib/libopie__L lib/libtacplus__L: lib/libmd__L .if ${MK_CDDL} != "no" +_cddl_lib_libumem= cddl/lib/libumem _cddl_lib= cddl/lib .endif ==== //depot/projects/soc2009/trasz_limits/bin/kill/kill.c#6 (text+ko) ==== @@ -26,6 +26,10 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ +/* + * Important: This file is used both as a standalone program /bin/kill and + * as a builtin for /bin/sh (#define SHELL). + */ #if 0 #ifndef lint @@ -39,7 +43,7 @@ #endif /* not lint */ #endif #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/kill/kill.c,v 1.24 2011/02/04 16:40:50 jilles Exp $"); +__FBSDID("$FreeBSD: src/bin/kill/kill.c,v 1.25 2011/03/01 21:48:22 jilles Exp $"); #include <ctype.h> #include <err.h> ==== //depot/projects/soc2009/trasz_limits/cddl/compat/opensolaris/include/fcntl.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/cddl/compat/opensolaris/include/fcntl.h,v 1.2 2008/03/28 22:16:04 jb Exp $ + * $FreeBSD: src/cddl/compat/opensolaris/include/fcntl.h,v 1.3 2011/02/27 19:41:40 pjd Exp $ * */ @@ -32,6 +32,7 @@ #include_next <fcntl.h> -#define open64 open +#define open64(...) open(__VA_ARGS__) +#define openat64(...) openat(__VA_ARGS__) #endif ==== //depot/projects/soc2009/trasz_limits/cddl/compat/opensolaris/include/mnttab.h#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/cddl/compat/opensolaris/include/mnttab.h,v 1.5 2010/07/12 23:49:04 mm Exp $ */ +/* $FreeBSD: src/cddl/compat/opensolaris/include/mnttab.h,v 1.6 2011/02/27 19:41:40 pjd Exp $ */ #ifndef _OPENSOLARIS_MNTTAB_H_ #define _OPENSOLARIS_MNTTAB_H_ @@ -12,6 +12,10 @@ #define MNTTAB _PATH_DEVZERO #define MNT_LINE_MAX 1024 +#define MS_OVERLAY 0x0 +#define MS_NOMNTTAB 0x0 +#define MS_RDONLY 0x1 + #define umount2(p, f) unmount(p, f) struct mnttab { ==== //depot/projects/soc2009/trasz_limits/cddl/compat/opensolaris/include/priv.h#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/cddl/compat/opensolaris/include/priv.h,v 1.3 2008/04/22 07:42:58 jb Exp $ */ +/* $FreeBSD: src/cddl/compat/opensolaris/include/priv.h,v 1.4 2011/02/27 19:41:40 pjd Exp $ */ #ifndef _OPENSOLARIS_PRIV_H_ #define _OPENSOLARIS_PRIV_H_ @@ -10,7 +10,7 @@ #define PRIV_SYS_CONFIG 0 static __inline int -priv_ineffect(priv) +priv_ineffect(int priv) { assert(priv == PRIV_SYS_CONFIG); ==== //depot/projects/soc2009/trasz_limits/cddl/compat/opensolaris/include/solaris.h#2 (text+ko) ==== @@ -1,10 +1,14 @@ -/* $FreeBSD: src/cddl/compat/opensolaris/include/solaris.h,v 1.3 2008/04/22 07:42:58 jb Exp $ */ +/* $FreeBSD: src/cddl/compat/opensolaris/include/solaris.h,v 1.4 2011/02/27 19:41:40 pjd Exp $ */ #ifndef _SOLARIS_H_ #define _SOLARIS_H_ #include <sys/ccompile.h> -#define dirent64 dirent +#include <fcntl.h> + +#define NOTE(s) + +int mkdirp(const char *, mode_t); #endif /* !_SOLARIS_H_ */ ==== //depot/projects/soc2009/trasz_limits/cddl/compat/opensolaris/misc/fsshare.c#3 (text+ko) ==== @@ -25,18 +25,20 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/cddl/compat/opensolaris/misc/fsshare.c,v 1.4 2010/07/07 07:09:33 mm Exp $"); +__FBSDID("$FreeBSD: src/cddl/compat/opensolaris/misc/fsshare.c,v 1.5 2011/02/27 19:41:40 pjd Exp $"); #include <sys/param.h> -#include <stdio.h> -#include <unistd.h> + +#include <assert.h> +#include <errno.h> #include <fcntl.h> -#include <string.h> -#include <errno.h> +#include <fsshare.h> #include <libutil.h> -#include <assert.h> #include <pathnames.h> /* _PATH_MOUNTDPID */ -#include <fsshare.h> +#include <signal.h> +#include <stdio.h> +#include <string.h> +#include <unistd.h> #define FILE_HEADER "# !!! DO NOT EDIT THIS FILE MANUALLY !!!\n\n" #define OPTSSIZE 1024 ==== //depot/projects/soc2009/trasz_limits/cddl/compat/opensolaris/misc/zmount.c#2 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/cddl/compat/opensolaris/misc/zmount.c,v 1.3 2008/11/17 20:49:29 pjd Exp $"); +__FBSDID("$FreeBSD: src/cddl/compat/opensolaris/misc/zmount.c,v 1.4 2011/02/27 19:41:40 pjd Exp $"); #include <sys/param.h> #include <sys/mount.h> @@ -39,6 +39,7 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> +#include <mnttab.h> static void build_iovec(struct iovec **iov, int *iovlen, const char *name, void *val, @@ -78,7 +79,7 @@ assert(spec != NULL); assert(dir != NULL); - assert(mflag == 0); + assert(mflag == 0 || mflag == MS_RDONLY); assert(fstype != NULL); assert(strcmp(fstype, MNTTYPE_ZFS) == 0); assert(dataptr == NULL); @@ -91,6 +92,8 @@ iov = NULL; iovlen = 0; + if (mflag & MS_RDONLY) + build_iovec(&iov, &iovlen, "ro", NULL, 0); build_iovec(&iov, &iovlen, "fstype", fstype, (size_t)-1); build_iovec(&iov, &iovlen, "fspath", __DECONST(char *, dir), (size_t)-1); ==== //depot/projects/soc2009/trasz_limits/cddl/contrib/opensolaris/cmd/zdb/zdb.c#6 (text+ko) ==== @@ -19,8 +19,7 @@ * CDDL HEADER END */ /* - * Copyright 2009 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. + * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. */ #include <stdio.h> @@ -34,6 +33,9 @@ #include <sys/zap.h> #include <sys/fs/zfs.h> #include <sys/zfs_znode.h> +#include <sys/zfs_sa.h> +#include <sys/sa.h> +#include <sys/sa_impl.h> #include <sys/vdev.h> #include <sys/vdev_impl.h> #include <sys/metaslab_impl.h> @@ -51,10 +53,25 @@ #include <sys/zio_compress.h> #include <sys/zfs_fuid.h> #include <sys/arc.h> +#include <sys/ddt.h> #undef ZFS_MAXNAMELEN #undef verify #include <libzfs.h> +#define ZDB_COMPRESS_NAME(idx) ((idx) < ZIO_COMPRESS_FUNCTIONS ? \ + zio_compress_table[(idx)].ci_name : "UNKNOWN") +#define ZDB_CHECKSUM_NAME(idx) ((idx) < ZIO_CHECKSUM_FUNCTIONS ? \ + zio_checksum_table[(idx)].ci_name : "UNKNOWN") +#define ZDB_OT_NAME(idx) ((idx) < DMU_OT_NUMTYPES ? \ + dmu_ot[(idx)].ot_name : "UNKNOWN") +#define ZDB_OT_TYPE(idx) ((idx) < DMU_OT_NUMTYPES ? (idx) : DMU_OT_NUMTYPES) + +#ifndef lint +extern int zfs_recover; +#else +int zfs_recover; +#endif + const char cmdname[] = "zdb"; uint8_t dump_opt[256]; @@ -64,8 +81,6 @@ uint64_t *zopt_object = NULL; int zopt_objects = 0; libzfs_handle_t *g_zfs; -boolean_t zdb_sig_user_data = B_TRUE; -int zdb_sig_cksumalg = ZIO_CHECKSUM_SHA256; /* * These libumem hooks provide a reasonable set of defaults for the allocator's @@ -87,39 +102,56 @@ usage(void) { (void) fprintf(stderr, - "Usage: %s [-udibcsvL] [-U cachefile_path] [-t txg]\n" - "\t [-S user:cksumalg] " - "dataset [object...]\n" - " %s -C [pool]\n" - " %s -l dev\n" - " %s -R pool:vdev:offset:size:flags\n" - " %s [-p path_to_vdev_dir]\n" - " %s -e pool | GUID | devid ...\n", - cmdname, cmdname, cmdname, cmdname, cmdname, cmdname); + "Usage: %s [-CumdibcsDvhL] poolname [object...]\n" + " %s [-div] dataset [object...]\n" + " %s -m [-L] poolname [vdev [metaslab...]]\n" + " %s -R poolname vdev:offset:size[:flags]\n" + " %s -S poolname\n" + " %s -l [-u] device\n" + " %s -C\n\n", + cmdname, cmdname, cmdname, cmdname, cmdname, cmdname, cmdname); - (void) fprintf(stderr, " -u uberblock\n"); - (void) fprintf(stderr, " -d datasets\n"); - (void) fprintf(stderr, " -C cached pool configuration\n"); - (void) fprintf(stderr, " -i intent logs\n"); - (void) fprintf(stderr, " -b block statistics\n"); - (void) fprintf(stderr, " -m metaslabs\n"); - (void) fprintf(stderr, " -c checksum all metadata (twice for " + (void) fprintf(stderr, " Dataset name must include at least one " + "separator character '/' or '@'\n"); + (void) fprintf(stderr, " If dataset name is specified, only that " + "dataset is dumped\n"); + (void) fprintf(stderr, " If object numbers are specified, only " + "those objects are dumped\n\n"); + (void) fprintf(stderr, " Options to control amount of output:\n"); + (void) fprintf(stderr, " -u uberblock\n"); + (void) fprintf(stderr, " -d dataset(s)\n"); + (void) fprintf(stderr, " -i intent logs\n"); + (void) fprintf(stderr, " -C config (or cachefile if alone)\n"); + (void) fprintf(stderr, " -h pool history\n"); + (void) fprintf(stderr, " -b block statistics\n"); + (void) fprintf(stderr, " -m metaslabs\n"); + (void) fprintf(stderr, " -c checksum all metadata (twice for " "all data) blocks\n"); - (void) fprintf(stderr, " -s report stats on zdb's I/O\n"); - (void) fprintf(stderr, " -S <user|all>:<cksum_alg|all> -- " - "dump blkptr signatures\n"); - (void) fprintf(stderr, " -v verbose (applies to all others)\n"); + (void) fprintf(stderr, " -s report stats on zdb's I/O\n"); + (void) fprintf(stderr, " -D dedup statistics\n"); + (void) fprintf(stderr, " -S simulate dedup to measure effect\n"); + (void) fprintf(stderr, " -v verbose (applies to all others)\n"); (void) fprintf(stderr, " -l dump label contents\n"); (void) fprintf(stderr, " -L disable leak tracking (do not " "load spacemaps)\n"); - (void) fprintf(stderr, " -U cachefile_path -- use alternate " + (void) fprintf(stderr, " -R read and display block from a " + "device\n\n"); + (void) fprintf(stderr, " Below options are intended for use " + "with other options (except -l):\n"); + (void) fprintf(stderr, " -A ignore assertions (-A), enable " + "panic recovery (-AA) or both (-AAA)\n"); + (void) fprintf(stderr, " -F attempt automatic rewind within " + "safe range of transaction groups\n"); + (void) fprintf(stderr, " -U <cachefile_path> -- use alternate " "cachefile\n"); - (void) fprintf(stderr, " -R read and display block from a " - "device\n"); - (void) fprintf(stderr, " -e Pool is exported/destroyed/" - "has altroot\n"); - (void) fprintf(stderr, " -p <Path to vdev dir> (use with -e)\n"); - (void) fprintf(stderr, " -t <txg> highest txg to use when " + (void) fprintf(stderr, " -X attempt extreme rewind (does not " + "work with dataset)\n"); + (void) fprintf(stderr, " -e pool is exported/destroyed/" + "has altroot/not in a cachefile\n"); + (void) fprintf(stderr, " -p <path> -- use one or more with " + "-e to specify path to vdev dir\n"); + (void) fprintf(stderr, " -P print numbers parsable\n"); + (void) fprintf(stderr, " -t <txg> -- highest txg to use when " "searching for uberblocks\n"); (void) fprintf(stderr, "Specify an option more than once (e.g. -bb) " "to make only that option verbose\n"); @@ -146,68 +178,6 @@ exit(1); } -static void -dump_nvlist(nvlist_t *list, int indent) >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201103031726.p23HQl42047559>