Module Name: src Committed By: haad Date: Sat Feb 27 23:43:54 UTC 2010
Modified Files: src/external/cddl/osnet/dist/cmd/zfs: zfs_main.c src/external/cddl/osnet/dist/cmd/zpool: zpool_vdev.c src/external/cddl/osnet/dist/cmd/ztest: ztest.c src/external/cddl/osnet/dist/lib/libdtrace/common: drti.c dt_consume.c dt_error.c dt_impl.h dt_module.c dt_pid.c dt_printf.c dt_proc.c dt_program.c dt_subr.c src/external/cddl/osnet/dist/lib/libzfs/common: libzfs_dataset.c libzfs_import.c libzfs_mount.c libzfs_pool.c libzfs_util.c src/external/cddl/osnet/dist/tools/ctf/cvt: ctf.c tdata.c src/external/cddl/osnet/dist/uts/common: Makefile.files src/external/cddl/osnet/dist/uts/common/dtrace: dtrace.c fasttrap.c lockstat.c profile.c sdt_subr.c systrace.c src/external/cddl/osnet/dist/uts/common/fs/zfs: arc.c dbuf.c dmu.c dnode.c dnode_sync.c dsl_deleg.c dsl_pool.c rrwlock.c spa.c spa_config.c spa_history.c space_map.c txg.c vdev.c vdev_disk.c zap_micro.c zfs_acl.c zfs_dir.c zfs_fuid.c zfs_ioctl.c zfs_replay.c zfs_vfsops.c zfs_vnops.c zfs_znode.c zio.c zvol.c src/external/cddl/osnet/dist/uts/common/fs/zfs/sys: zfs_dir.h zfs_znode.h zvol.h src/external/cddl/osnet/dist/uts/common/sys: dtrace.h processor.h sysevent.h src/external/cddl/osnet/dist/uts/common/sys/fs: zfs.h Log Message: Merge NetBSD local changes to new zfs version 22 sources. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/external/cddl/osnet/dist/cmd/zfs/zfs_main.c cvs rdiff -u -r1.2 -r1.3 src/external/cddl/osnet/dist/cmd/zpool/zpool_vdev.c cvs rdiff -u -r1.3 -r1.4 src/external/cddl/osnet/dist/cmd/ztest/ztest.c cvs rdiff -u -r1.2 -r1.3 \ src/external/cddl/osnet/dist/lib/libdtrace/common/drti.c \ src/external/cddl/osnet/dist/lib/libdtrace/common/dt_error.c \ src/external/cddl/osnet/dist/lib/libdtrace/common/dt_impl.h \ src/external/cddl/osnet/dist/lib/libdtrace/common/dt_printf.c \ src/external/cddl/osnet/dist/lib/libdtrace/common/dt_program.c cvs rdiff -u -r1.3 -r1.4 \ src/external/cddl/osnet/dist/lib/libdtrace/common/dt_consume.c \ src/external/cddl/osnet/dist/lib/libdtrace/common/dt_module.c \ src/external/cddl/osnet/dist/lib/libdtrace/common/dt_pid.c \ src/external/cddl/osnet/dist/lib/libdtrace/common/dt_proc.c \ src/external/cddl/osnet/dist/lib/libdtrace/common/dt_subr.c cvs rdiff -u -r1.1.1.2 -r1.2 \ src/external/cddl/osnet/dist/lib/libzfs/common/libzfs_dataset.c cvs rdiff -u -r1.2 -r1.3 \ src/external/cddl/osnet/dist/lib/libzfs/common/libzfs_import.c \ src/external/cddl/osnet/dist/lib/libzfs/common/libzfs_mount.c \ src/external/cddl/osnet/dist/lib/libzfs/common/libzfs_pool.c \ src/external/cddl/osnet/dist/lib/libzfs/common/libzfs_util.c cvs rdiff -u -r1.3 -r1.4 src/external/cddl/osnet/dist/tools/ctf/cvt/ctf.c \ src/external/cddl/osnet/dist/tools/ctf/cvt/tdata.c cvs rdiff -u -r1.1 -r1.2 \ src/external/cddl/osnet/dist/uts/common/Makefile.files cvs rdiff -u -r1.6 -r1.7 \ src/external/cddl/osnet/dist/uts/common/dtrace/dtrace.c cvs rdiff -u -r1.2 -r1.3 \ src/external/cddl/osnet/dist/uts/common/dtrace/fasttrap.c \ src/external/cddl/osnet/dist/uts/common/dtrace/lockstat.c \ src/external/cddl/osnet/dist/uts/common/dtrace/profile.c \ src/external/cddl/osnet/dist/uts/common/dtrace/sdt_subr.c \ src/external/cddl/osnet/dist/uts/common/dtrace/systrace.c cvs rdiff -u -r1.5 -r1.6 src/external/cddl/osnet/dist/uts/common/fs/zfs/arc.c \ src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_znode.c cvs rdiff -u -r1.3 -r1.4 \ src/external/cddl/osnet/dist/uts/common/fs/zfs/dbuf.c \ src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_ioctl.c \ src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vfsops.c \ src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vnops.c cvs rdiff -u -r1.2 -r1.3 src/external/cddl/osnet/dist/uts/common/fs/zfs/dmu.c \ src/external/cddl/osnet/dist/uts/common/fs/zfs/dnode.c \ src/external/cddl/osnet/dist/uts/common/fs/zfs/dnode_sync.c \ src/external/cddl/osnet/dist/uts/common/fs/zfs/dsl_deleg.c \ src/external/cddl/osnet/dist/uts/common/fs/zfs/dsl_pool.c \ src/external/cddl/osnet/dist/uts/common/fs/zfs/rrwlock.c \ src/external/cddl/osnet/dist/uts/common/fs/zfs/spa.c \ src/external/cddl/osnet/dist/uts/common/fs/zfs/spa_config.c \ src/external/cddl/osnet/dist/uts/common/fs/zfs/spa_history.c \ src/external/cddl/osnet/dist/uts/common/fs/zfs/space_map.c \ src/external/cddl/osnet/dist/uts/common/fs/zfs/txg.c \ src/external/cddl/osnet/dist/uts/common/fs/zfs/vdev.c \ src/external/cddl/osnet/dist/uts/common/fs/zfs/vdev_disk.c \ src/external/cddl/osnet/dist/uts/common/fs/zfs/zap_micro.c \ src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_acl.c \ src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_fuid.c \ src/external/cddl/osnet/dist/uts/common/fs/zfs/zio.c \ src/external/cddl/osnet/dist/uts/common/fs/zfs/zvol.c cvs rdiff -u -r1.4 -r1.5 \ src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_dir.c \ src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_replay.c cvs rdiff -u -r1.2 -r1.3 \ src/external/cddl/osnet/dist/uts/common/fs/zfs/sys/zfs_dir.h \ src/external/cddl/osnet/dist/uts/common/fs/zfs/sys/zvol.h cvs rdiff -u -r1.3 -r1.4 \ src/external/cddl/osnet/dist/uts/common/fs/zfs/sys/zfs_znode.h cvs rdiff -u -r1.3 -r1.4 src/external/cddl/osnet/dist/uts/common/sys/dtrace.h cvs rdiff -u -r1.2 -r1.3 \ src/external/cddl/osnet/dist/uts/common/sys/processor.h \ src/external/cddl/osnet/dist/uts/common/sys/sysevent.h cvs rdiff -u -r1.2 -r1.3 src/external/cddl/osnet/dist/uts/common/sys/fs/zfs.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
diffs are larger than 1MB and have been omitted