Date: Tue, 18 Nov 2008 21:41:31 GMT From: Julian Elischer <julian@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 153171 for review Message-ID: <200811182141.mAILfV76067912@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=153171 Change 153171 by julian@julian_trafmon1 on 2008/11/18 21:40:54 IFC@153165 Affected files ... .. //depot/projects/arp-v2/src/cddl/compat/opensolaris/include/libshare.h#1 branch .. //depot/projects/arp-v2/src/cddl/compat/opensolaris/include/mnttab.h#3 integrate .. //depot/projects/arp-v2/src/cddl/compat/opensolaris/misc/mnttab.c#2 integrate .. //depot/projects/arp-v2/src/cddl/compat/opensolaris/misc/zmount.c#2 integrate .. //depot/projects/arp-v2/src/cddl/compat/opensolaris/misc/zone.c#2 integrate .. //depot/projects/arp-v2/src/cddl/contrib/opensolaris/cmd/zdb/zdb.8#2 integrate .. //depot/projects/arp-v2/src/cddl/contrib/opensolaris/cmd/zdb/zdb.c#2 integrate .. //depot/projects/arp-v2/src/cddl/contrib/opensolaris/cmd/zdb/zdb_il.c#2 integrate .. //depot/projects/arp-v2/src/cddl/contrib/opensolaris/cmd/zfs/zfs.8#2 integrate .. //depot/projects/arp-v2/src/cddl/contrib/opensolaris/cmd/zfs/zfs_iter.c#2 integrate .. //depot/projects/arp-v2/src/cddl/contrib/opensolaris/cmd/zfs/zfs_iter.h#2 integrate .. //depot/projects/arp-v2/src/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c#2 integrate .. //depot/projects/arp-v2/src/cddl/contrib/opensolaris/cmd/zinject/translate.c#1 branch .. //depot/projects/arp-v2/src/cddl/contrib/opensolaris/cmd/zinject/zinject.c#1 branch .. //depot/projects/arp-v2/src/cddl/contrib/opensolaris/cmd/zinject/zinject.h#1 branch .. //depot/projects/arp-v2/src/cddl/contrib/opensolaris/cmd/zpool/zpool.8#2 integrate .. //depot/projects/arp-v2/src/cddl/contrib/opensolaris/cmd/zpool/zpool_iter.c#2 integrate .. //depot/projects/arp-v2/src/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c#2 integrate .. //depot/projects/arp-v2/src/cddl/contrib/opensolaris/cmd/zpool/zpool_util.c#2 integrate .. //depot/projects/arp-v2/src/cddl/contrib/opensolaris/cmd/zpool/zpool_util.h#2 integrate .. //depot/projects/arp-v2/src/cddl/contrib/opensolaris/cmd/zpool/zpool_vdev.c#2 integrate .. //depot/projects/arp-v2/src/cddl/contrib/opensolaris/cmd/ztest/ztest.c#2 integrate .. //depot/projects/arp-v2/src/cddl/contrib/opensolaris/head/assert.h#2 integrate .. //depot/projects/arp-v2/src/cddl/contrib/opensolaris/head/libintl.h#2 integrate .. //depot/projects/arp-v2/src/cddl/contrib/opensolaris/head/synch.h#2 integrate .. //depot/projects/arp-v2/src/cddl/contrib/opensolaris/head/thread.h#2 integrate .. //depot/projects/arp-v2/src/cddl/contrib/opensolaris/lib/libnvpair/libnvpair.c#2 integrate .. //depot/projects/arp-v2/src/cddl/contrib/opensolaris/lib/libnvpair/libnvpair.h#2 integrate .. //depot/projects/arp-v2/src/cddl/contrib/opensolaris/lib/libuutil/common/libuutil.h#2 integrate .. //depot/projects/arp-v2/src/cddl/contrib/opensolaris/lib/libuutil/common/libuutil_common.h#2 integrate .. //depot/projects/arp-v2/src/cddl/contrib/opensolaris/lib/libuutil/common/uu_alloc.c#2 integrate .. //depot/projects/arp-v2/src/cddl/contrib/opensolaris/lib/libuutil/common/uu_avl.c#2 integrate .. //depot/projects/arp-v2/src/cddl/contrib/opensolaris/lib/libuutil/common/uu_dprintf.c#2 integrate .. //depot/projects/arp-v2/src/cddl/contrib/opensolaris/lib/libuutil/common/uu_list.c#2 integrate .. //depot/projects/arp-v2/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h#2 integrate .. //depot/projects/arp-v2/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_changelist.c#2 integrate .. //depot/projects/arp-v2/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c#2 integrate .. //depot/projects/arp-v2/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_graph.c#2 integrate .. //depot/projects/arp-v2/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_impl.h#2 integrate .. //depot/projects/arp-v2/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c#2 integrate .. //depot/projects/arp-v2/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_mount.c#2 integrate .. //depot/projects/arp-v2/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c#2 integrate .. //depot/projects/arp-v2/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c#1 branch .. //depot/projects/arp-v2/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_status.c#2 integrate .. //depot/projects/arp-v2/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_util.c#2 integrate .. //depot/projects/arp-v2/src/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c#2 integrate .. //depot/projects/arp-v2/src/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h#4 integrate .. //depot/projects/arp-v2/src/cddl/contrib/opensolaris/lib/libzpool/common/taskq.c#2 integrate .. //depot/projects/arp-v2/src/cddl/contrib/opensolaris/lib/libzpool/common/util.c#2 integrate .. //depot/projects/arp-v2/src/cddl/lib/libzfs/Makefile#3 integrate .. //depot/projects/arp-v2/src/cddl/lib/libzpool/Makefile#3 integrate .. //depot/projects/arp-v2/src/cddl/sbin/zpool/Makefile#3 integrate .. //depot/projects/arp-v2/src/cddl/usr.bin/Makefile#4 integrate .. //depot/projects/arp-v2/src/cddl/usr.bin/zinject/Makefile#1 branch .. //depot/projects/arp-v2/src/cddl/usr.bin/ztest/Makefile#3 integrate .. //depot/projects/arp-v2/src/cddl/usr.sbin/zdb/Makefile#3 integrate .. //depot/projects/arp-v2/src/contrib/gdb/gdb/arm-tdep.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/ANNOUNCE#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/FREEBSD-upgrade#5 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/FREEBSD-vendor#4 delete .. //depot/projects/arp-v2/src/contrib/ncurses/INSTALL#4 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/MANIFEST#4 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/NEWS#5 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/TO-DO#3 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/aclocal.m4#4 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/announce.html.in#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/config.guess#4 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/config.sub#4 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/configure#4 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/configure.in#4 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/dist.mk#5 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/doc/html/announce.html#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/form/form.priv.h#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/form/frm_def.c#3 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/form/frm_driver.c#4 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/form/frm_req_name.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/include/MKterm.h.awk.in#3 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/include/capdefaults.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/include/curses.h.in#5 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/include/curses.tail#3 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/include/nc_alloc.h#3 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/include/nc_panel.h#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/include/ncurses_defs#4 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/include/term_entry.h#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/man/curs_getcchar.3x#3 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/man/curs_memleaks.3x#1 branch .. //depot/projects/arp-v2/src/contrib/ncurses/man/curs_terminfo.3x#3 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/man/curs_util.3x#3 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/man/form.3x#3 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/man/form_driver.3x#3 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/man/form_field_buffer.3x#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/man/man_db.renames#4 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/man/menu_attributes.3x#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/man/menu_driver.3x#3 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/man/menu_pattern.3x#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/man/ncurses.3x#3 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/menu/m_driver.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/menu/m_req_name.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/misc/ncu-indent#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/misc/ncurses.supp#1 branch .. //depot/projects/arp-v2/src/contrib/ncurses/misc/terminfo.src#5 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/Makefile.in#3 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/base/MKkeyname.awk#3 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/base/MKlib_gen.sh#4 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/base/MKunctrl.awk#4 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/base/lib_addch.c#4 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/base/lib_delwin.c#4 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/base/lib_freeall.c#4 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/base/lib_getch.c#5 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/base/lib_getstr.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/base/lib_initscr.c#4 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/base/lib_mouse.c#3 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/base/lib_newterm.c#5 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/base/lib_newwin.c#5 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/base/lib_overlay.c#4 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/base/lib_restart.c#4 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/base/lib_screen.c#3 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/base/lib_set_term.c#5 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/base/lib_slk.c#3 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/base/lib_slkrefr.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/base/lib_ungetch.c#4 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/base/lib_window.c#4 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/base/resizeterm.c#5 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/base/tries.c#3 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/base/use_window.c#4 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/base/wresize.c#4 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/curses.priv.h#5 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/fifo_defs.h#3 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/llib-lncurses#3 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/llib-lncursest#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/llib-lncursesw#3 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/tinfo/MKcodes.awk#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/tinfo/MKnames.awk#3 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/tinfo/alloc_entry.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/tinfo/alloc_ttype.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/tinfo/captoinfo.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/tinfo/comp_expand.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/tinfo/comp_hash.c#3 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/tinfo/comp_parse.c#3 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/tinfo/comp_scan.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/tinfo/entries.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/tinfo/home_terminfo.c#3 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/tinfo/init_keytry.c#4 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/tinfo/lib_acs.c#3 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/tinfo/lib_baudrate.c#3 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/tinfo/lib_cur_term.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/tinfo/lib_data.c#5 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/tinfo/lib_options.c#4 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/tinfo/lib_raw.c#3 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/tinfo/lib_setup.c#5 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/tinfo/lib_termcap.c#3 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/tinfo/lib_tgoto.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/tinfo/lib_tparm.c#3 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/tinfo/lib_tputs.c#3 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/tinfo/lib_ttyflags.c#4 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/tinfo/make_keys.c#3 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/tinfo/name_match.c#3 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/tinfo/parse_entry.c#3 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/tinfo/read_entry.c#3 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/tinfo/use_screen.c#3 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/tinfo/write_entry.c#3 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/trace/lib_trace.c#4 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/trace/lib_traceatr.c#3 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/trace/lib_tracebits.c#3 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/trace/lib_tracechr.c#3 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/trace/lib_tracedmp.c#3 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/trace/lib_tracemse.c#3 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/trace/trace_buf.c#3 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/trace/trace_tries.c#3 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/trace/varargs.c#3 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/trace/visbuf.c#3 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/tty/hardscroll.c#3 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/tty/lib_mvcur.c#3 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/tty/lib_twait.c#4 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/tty/tty_update.c#4 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/widechar/charable.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/widechar/lib_get_wch.c#3 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/widechar/lib_get_wstr.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/widechar/lib_key_name.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/widechar/lib_unget_wch.c#3 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/panel/p_new.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/panel/panel.priv.h#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/progs/MKtermsort.sh#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/progs/Makefile.in#3 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/progs/dump_entry.c#4 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/progs/dump_entry.h#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/progs/infocmp.c#4 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/progs/progs.priv.h#3 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/progs/tic.c#3 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/progs/toe.c#4 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/progs/tput.c#3 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/progs/tset.c#3 integrate .. //depot/projects/arp-v2/src/contrib/sendmail/src/sendmail.h#3 integrate .. //depot/projects/arp-v2/src/gnu/usr.bin/gdb/Makefile#2 integrate .. //depot/projects/arp-v2/src/gnu/usr.bin/gdb/gdbserver/Makefile#2 integrate .. //depot/projects/arp-v2/src/gnu/usr.bin/gdb/gdbserver/fbsd-arm-low.c#1 branch .. //depot/projects/arp-v2/src/gnu/usr.bin/gdb/gdbserver/reg-arm.c#1 branch .. //depot/projects/arp-v2/src/include/utmp.h#2 integrate .. //depot/projects/arp-v2/src/lib/libarchive/test/test_acl_freebsd.c#2 integrate .. //depot/projects/arp-v2/src/lib/libc/gen/getvfsbyname.3#2 integrate .. //depot/projects/arp-v2/src/lib/libc/i386/sys/pipe.S#3 integrate .. //depot/projects/arp-v2/src/lib/libc/i386/sys/reboot.S#3 integrate .. //depot/projects/arp-v2/src/lib/libc/i386/sys/setlogin.S#3 integrate .. //depot/projects/arp-v2/src/lib/libpmc/pmc.iaf.3#2 integrate .. //depot/projects/arp-v2/src/lib/libstand/printf.c#2 integrate .. //depot/projects/arp-v2/src/lib/ncurses/ncurses/Makefile#4 integrate .. //depot/projects/arp-v2/src/lib/ncurses/ncurses/ncurses_cfg.h#5 integrate .. //depot/projects/arp-v2/src/sbin/geom/class/part/Makefile#2 integrate .. //depot/projects/arp-v2/src/sbin/geom/class/part/geom_part.c#5 integrate .. //depot/projects/arp-v2/src/share/man/man9/VFS_SET.9#2 integrate .. //depot/projects/arp-v2/src/share/man/man9/bus_dma.9#4 integrate .. //depot/projects/arp-v2/src/share/man/man9/devfs_set_cdevpriv.9#2 integrate .. //depot/projects/arp-v2/src/share/misc/committers-src.dot#6 integrate .. //depot/projects/arp-v2/src/sys/amd64/linux32/linux.h#4 integrate .. //depot/projects/arp-v2/src/sys/arm/at91/at91_mci.c#3 integrate .. //depot/projects/arp-v2/src/sys/arm/at91/uart_dev_at91usart.c#6 integrate .. //depot/projects/arp-v2/src/sys/boot/Makefile#5 integrate .. //depot/projects/arp-v2/src/sys/boot/common/bootstrap.h#3 integrate .. //depot/projects/arp-v2/src/sys/boot/i386/Makefile#2 integrate .. //depot/projects/arp-v2/src/sys/boot/i386/libi386/bootinfo32.c#2 integrate .. //depot/projects/arp-v2/src/sys/boot/i386/libi386/devicename.c#3 integrate .. //depot/projects/arp-v2/src/sys/boot/i386/loader/Makefile#3 integrate .. //depot/projects/arp-v2/src/sys/boot/i386/loader/conf.c#2 integrate .. //depot/projects/arp-v2/src/sys/boot/i386/loader/main.c#3 integrate .. //depot/projects/arp-v2/src/sys/boot/i386/zfsboot/Makefile#1 branch .. //depot/projects/arp-v2/src/sys/boot/i386/zfsboot/zfsboot.c#1 branch .. //depot/projects/arp-v2/src/sys/boot/i386/zfsboot/zfsldr.S#1 branch .. //depot/projects/arp-v2/src/sys/boot/zfs/Makefile#1 branch .. //depot/projects/arp-v2/src/sys/boot/zfs/zfs.c#1 branch .. //depot/projects/arp-v2/src/sys/boot/zfs/zfsimpl.c#1 branch .. //depot/projects/arp-v2/src/sys/cddl/boot/zfs/README#1 branch .. //depot/projects/arp-v2/src/sys/cddl/boot/zfs/fletcher.c#1 branch .. //depot/projects/arp-v2/src/sys/cddl/boot/zfs/lzjb.c#1 branch .. //depot/projects/arp-v2/src/sys/cddl/boot/zfs/sha256.c#1 branch .. //depot/projects/arp-v2/src/sys/cddl/boot/zfs/zfsimpl.h#1 branch .. //depot/projects/arp-v2/src/sys/cddl/boot/zfs/zfssubr.c#1 branch .. //depot/projects/arp-v2/src/sys/cddl/compat/opensolaris/kern/opensolaris_atomic.c#3 integrate .. //depot/projects/arp-v2/src/sys/cddl/compat/opensolaris/kern/opensolaris_kmem.c#4 integrate .. //depot/projects/arp-v2/src/sys/cddl/compat/opensolaris/kern/opensolaris_lookup.c#1 branch .. //depot/projects/arp-v2/src/sys/cddl/compat/opensolaris/kern/opensolaris_misc.c#2 integrate .. //depot/projects/arp-v2/src/sys/cddl/compat/opensolaris/kern/opensolaris_policy.c#3 integrate .. //depot/projects/arp-v2/src/sys/cddl/compat/opensolaris/kern/opensolaris_vfs.c#4 integrate .. //depot/projects/arp-v2/src/sys/cddl/compat/opensolaris/kern/opensolaris_zone.c#2 integrate .. //depot/projects/arp-v2/src/sys/cddl/compat/opensolaris/sys/acl.h#3 delete .. //depot/projects/arp-v2/src/sys/cddl/compat/opensolaris/sys/atomic.h#4 integrate .. //depot/projects/arp-v2/src/sys/cddl/compat/opensolaris/sys/callb.h#3 delete .. //depot/projects/arp-v2/src/sys/cddl/compat/opensolaris/sys/cred.h#2 integrate .. //depot/projects/arp-v2/src/sys/cddl/compat/opensolaris/sys/dnlc.h#2 integrate .. //depot/projects/arp-v2/src/sys/cddl/compat/opensolaris/sys/file.h#1 branch .. //depot/projects/arp-v2/src/sys/cddl/compat/opensolaris/sys/kidmap.h#1 branch .. //depot/projects/arp-v2/src/sys/cddl/compat/opensolaris/sys/kmem.h#3 integrate .. //depot/projects/arp-v2/src/sys/cddl/compat/opensolaris/sys/misc.h#2 integrate .. //depot/projects/arp-v2/src/sys/cddl/compat/opensolaris/sys/mntent.h#3 integrate .. //depot/projects/arp-v2/src/sys/cddl/compat/opensolaris/sys/param.h#2 integrate .. //depot/projects/arp-v2/src/sys/cddl/compat/opensolaris/sys/pathname.h#1 branch .. //depot/projects/arp-v2/src/sys/cddl/compat/opensolaris/sys/policy.h#3 integrate .. //depot/projects/arp-v2/src/sys/cddl/compat/opensolaris/sys/proc.h#2 integrate .. //depot/projects/arp-v2/src/sys/cddl/compat/opensolaris/sys/refstr.h#1 branch .. //depot/projects/arp-v2/src/sys/cddl/compat/opensolaris/sys/sid.h#1 branch .. //depot/projects/arp-v2/src/sys/cddl/compat/opensolaris/sys/sig.h#1 branch .. //depot/projects/arp-v2/src/sys/cddl/compat/opensolaris/sys/sunddi.h#2 integrate .. //depot/projects/arp-v2/src/sys/cddl/compat/opensolaris/sys/sysmacros.h#3 integrate .. //depot/projects/arp-v2/src/sys/cddl/compat/opensolaris/sys/time.h#2 integrate .. //depot/projects/arp-v2/src/sys/cddl/compat/opensolaris/sys/types.h#3 integrate .. //depot/projects/arp-v2/src/sys/cddl/compat/opensolaris/sys/uio.h#3 integrate .. //depot/projects/arp-v2/src/sys/cddl/compat/opensolaris/sys/vfs.h#2 integrate .. //depot/projects/arp-v2/src/sys/cddl/compat/opensolaris/sys/vnode.h#2 integrate .. //depot/projects/arp-v2/src/sys/cddl/compat/opensolaris/sys/zone.h#2 integrate .. //depot/projects/arp-v2/src/sys/cddl/contrib/opensolaris/common/acl/acl_common.c#2 integrate .. //depot/projects/arp-v2/src/sys/cddl/contrib/opensolaris/common/acl/acl_common.h#2 integrate .. //depot/projects/arp-v2/src/sys/cddl/contrib/opensolaris/common/atomic/amd64/atomic.S#2 integrate .. //depot/projects/arp-v2/src/sys/cddl/contrib/opensolaris/common/atomic/i386/atomic.S#2 integrate .. //depot/projects/arp-v2/src/sys/cddl/contrib/opensolaris/common/avl/avl.c#2 integrate .. //depot/projects/arp-v2/src/sys/cddl/contrib/opensolaris/common/nvpair/nvpair.c#2 integrate .. //depot/projects/arp-v2/src/sys/cddl/contrib/opensolaris/common/unicode/u8_textprep.c#1 branch .. //depot/projects/arp-v2/src/sys/cddl/contrib/opensolaris/common/zfs/zfs_comutil.c#1 branch .. //depot/projects/arp-v2/src/sys/cddl/contrib/opensolaris/common/zfs/zfs_comutil.h#1 branch .. //depot/projects/arp-v2/src/sys/cddl/contrib/opensolaris/common/zfs/zfs_deleg.c#1 branch .. //depot/projects/arp-v2/src/sys/cddl/contrib/opensolaris/common/zfs/zfs_deleg.h#1 branch .. //depot/projects/arp-v2/src/sys/cddl/contrib/opensolaris/common/zfs/zfs_namecheck.c#2 integrate .. //depot/projects/arp-v2/src/sys/cddl/contrib/opensolaris/common/zfs/zfs_namecheck.h#2 integrate .. //depot/projects/arp-v2/src/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.c#2 integrate .. //depot/projects/arp-v2/src/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.h#2 integrate .. //depot/projects/arp-v2/src/sys/cddl/contrib/opensolaris/common/zfs/zpool_prop.c#1 branch .. //depot/projects/arp-v2/src/sys/cddl/contrib/opensolaris/common/zfs/zprop_common.c#1 branch .. //depot/projects/arp-v2/src/sys/cddl/contrib/opensolaris/uts/common/Makefile.files#2 integrate .. //depot/projects/arp-v2/src/sys/cddl/contrib/opensolaris/uts/common/fs/gfs.c#3 integrate .. //depot/projects/arp-v2/src/sys/cddl/contrib/opensolaris/uts/common/fs/vnode.c#1 branch .. //depot/projects/arp-v2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c#2 integrate .. //depot/projects/arp-v2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/bplist.c#2 integrate .. //depot/projects/arp-v2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c#2 integrate .. //depot/projects/arp-v2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c#2 integrate .. //depot/projects/arp-v2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_object.c#2 integrate .. //depot/projects/arp-v2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c#2 integrate .. //depot/projects/arp-v2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c#2 integrate .. //depot/projects/arp-v2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c#2 integrate .. //depot/projects/arp-v2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c#2 integrate .. //depot/projects/arp-v2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_zfetch.c#3 integrate .. //depot/projects/arp-v2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c#2 integrate .. //depot/projects/arp-v2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c#2 integrate .. //depot/projects/arp-v2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c#2 integrate .. //depot/projects/arp-v2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_deleg.c#1 branch .. //depot/projects/arp-v2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c#2 integrate .. //depot/projects/arp-v2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c#2 integrate .. //depot/projects/arp-v2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_prop.c#2 integrate .. //depot/projects/arp-v2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scrub.c#1 branch .. //depot/projects/arp-v2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_synctask.c#2 integrate .. //depot/projects/arp-v2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/metaslab.c#2 integrate .. //depot/projects/arp-v2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/refcount.c#3 integrate .. //depot/projects/arp-v2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/rrwlock.c#1 branch .. //depot/projects/arp-v2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sha256.c#2 integrate .. //depot/projects/arp-v2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c#2 integrate .. //depot/projects/arp-v2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_config.c#2 integrate .. //depot/projects/arp-v2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_errlog.c#2 integrate .. //depot/projects/arp-v2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_history.c#2 integrate .. //depot/projects/arp-v2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c#3 integrate .. //depot/projects/arp-v2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/space_map.c#2 integrate .. //depot/projects/arp-v2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/arc.h#2 integrate .. //depot/projects/arp-v2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/bplist.h#2 integrate .. //depot/projects/arp-v2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dbuf.h#2 integrate .. //depot/projects/arp-v2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h#2 integrate .. //depot/projects/arp-v2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_impl.h#2 integrate .. //depot/projects/arp-v2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_objset.h#2 integrate .. //depot/projects/arp-v2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_traverse.h#2 integrate .. //depot/projects/arp-v2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_tx.h#2 integrate .. //depot/projects/arp-v2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dnode.h#2 integrate .. //depot/projects/arp-v2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dataset.h#2 integrate .. //depot/projects/arp-v2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_deleg.h#1 branch .. //depot/projects/arp-v2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dir.h#2 integrate .. //depot/projects/arp-v2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_pool.h#2 integrate .. //depot/projects/arp-v2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_prop.h#2 integrate .. //depot/projects/arp-v2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_synctask.h#2 integrate .. //depot/projects/arp-v2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab.h#2 integrate .. //depot/projects/arp-v2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/refcount.h#3 integrate .. //depot/projects/arp-v2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/rrwlock.h#1 branch .. //depot/projects/arp-v2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h#2 integrate .. //depot/projects/arp-v2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa_boot.h#1 branch .. //depot/projects/arp-v2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa_impl.h#2 integrate .. //depot/projects/arp-v2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/txg.h#2 integrate .. //depot/projects/arp-v2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/txg_impl.h#2 integrate .. //depot/projects/arp-v2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/uberblock_impl.h#2 integrate .. //depot/projects/arp-v2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/unique.h#2 integrate .. //depot/projects/arp-v2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev.h#2 integrate .. //depot/projects/arp-v2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_disk.h#2 integrate .. //depot/projects/arp-v2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_impl.h#2 integrate .. //depot/projects/arp-v2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zap.h#2 integrate .. //depot/projects/arp-v2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zap_impl.h#2 integrate .. //depot/projects/arp-v2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zap_leaf.h#2 integrate .. //depot/projects/arp-v2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_acl.h#2 integrate .. //depot/projects/arp-v2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_context.h#2 integrate .. //depot/projects/arp-v2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ctldir.h#2 integrate .. //depot/projects/arp-v2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_dir.h#2 integrate .. //depot/projects/arp-v2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_fuid.h#1 branch .. //depot/projects/arp-v2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ioctl.h#2 integrate .. //depot/projects/arp-v2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_vfsops.h#2 integrate .. //depot/projects/arp-v2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h#3 integrate .. //depot/projects/arp-v2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zil.h#2 integrate .. //depot/projects/arp-v2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zil_impl.h#2 integrate .. //depot/projects/arp-v2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h#2 integrate .. //depot/projects/arp-v2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio_checksum.h#2 integrate .. //depot/projects/arp-v2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio_impl.h#2 integrate .. //depot/projects/arp-v2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zvol.h#2 integrate .. //depot/projects/arp-v2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c#2 integrate .. //depot/projects/arp-v2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/unique.c#2 integrate .. //depot/projects/arp-v2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c#2 integrate .. //depot/projects/arp-v2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_cache.c#2 integrate .. //depot/projects/arp-v2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_disk.c#2 integrate .. //depot/projects/arp-v2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_file.c#3 integrate .. //depot/projects/arp-v2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#2 integrate .. //depot/projects/arp-v2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c#2 integrate .. //depot/projects/arp-v2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_mirror.c#2 integrate .. //depot/projects/arp-v2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_missing.c#2 integrate .. //depot/projects/arp-v2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c#2 integrate .. //depot/projects/arp-v2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_raidz.c#2 integrate .. //depot/projects/arp-v2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_root.c#2 integrate .. //depot/projects/arp-v2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap.c#2 integrate .. //depot/projects/arp-v2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap_leaf.c#2 integrate .. //depot/projects/arp-v2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c#2 integrate .. //depot/projects/arp-v2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c#3 integrate .. //depot/projects/arp-v2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_byteswap.c#2 integrate .. //depot/projects/arp-v2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#3 integrate .. //depot/projects/arp-v2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c#2 integrate .. //depot/projects/arp-v2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_fm.c#2 integrate .. //depot/projects/arp-v2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_fuid.c#1 branch .. //depot/projects/arp-v2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#3 integrate .. //depot/projects/arp-v2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_log.c#2 integrate .. //depot/projects/arp-v2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c#3 integrate .. //depot/projects/arp-v2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_rlock.c#2 integrate .. //depot/projects/arp-v2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#2 integrate .. //depot/projects/arp-v2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#4 integrate .. //depot/projects/arp-v2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#5 integrate .. //depot/projects/arp-v2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c#2 integrate .. //depot/projects/arp-v2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c#2 integrate .. //depot/projects/arp-v2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio_checksum.c#2 integrate .. //depot/projects/arp-v2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio_inject.c#2 integrate .. //depot/projects/arp-v2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c#2 integrate .. //depot/projects/arp-v2/src/sys/cddl/contrib/opensolaris/uts/common/os/callb.c#2 integrate .. //depot/projects/arp-v2/src/sys/cddl/contrib/opensolaris/uts/common/os/list.c#2 integrate .. //depot/projects/arp-v2/src/sys/cddl/contrib/opensolaris/uts/common/os/taskq.c#2 integrate .. //depot/projects/arp-v2/src/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr.c#2 integrate .. //depot/projects/arp-v2/src/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr.h#2 integrate .. //depot/projects/arp-v2/src/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr_array.c#2 integrate .. //depot/projects/arp-v2/src/sys/cddl/contrib/opensolaris/uts/common/sys/acl.h#1 branch .. //depot/projects/arp-v2/src/sys/cddl/contrib/opensolaris/uts/common/sys/acl_impl.h#1 branch .. //depot/projects/arp-v2/src/sys/cddl/contrib/opensolaris/uts/common/sys/avl.h#2 integrate .. //depot/projects/arp-v2/src/sys/cddl/contrib/opensolaris/uts/common/sys/byteorder.h#2 integrate .. //depot/projects/arp-v2/src/sys/cddl/contrib/opensolaris/uts/common/sys/callb.h#2 integrate .. //depot/projects/arp-v2/src/sys/cddl/contrib/opensolaris/uts/common/sys/cpuvar.h#2 integrate .. //depot/projects/arp-v2/src/sys/cddl/contrib/opensolaris/uts/common/sys/cred.h#2 integrate .. //depot/projects/arp-v2/src/sys/cddl/contrib/opensolaris/uts/common/sys/dkio.h#2 integrate .. //depot/projects/arp-v2/src/sys/cddl/contrib/opensolaris/uts/common/sys/dklabel.h#2 integrate .. //depot/projects/arp-v2/src/sys/cddl/contrib/opensolaris/uts/common/sys/extdirent.h#1 branch .. //depot/projects/arp-v2/src/sys/cddl/contrib/opensolaris/uts/common/sys/fm/fs/zfs.h#2 integrate .. //depot/projects/arp-v2/src/sys/cddl/contrib/opensolaris/uts/common/sys/fm/protocol.h#2 integrate .. //depot/projects/arp-v2/src/sys/cddl/contrib/opensolaris/uts/common/sys/fm/util.h#2 integrate .. //depot/projects/arp-v2/src/sys/cddl/contrib/opensolaris/uts/common/sys/fs/zfs.h#2 integrate .. //depot/projects/arp-v2/src/sys/cddl/contrib/opensolaris/uts/common/sys/gfs.h#2 integrate .. //depot/projects/arp-v2/src/sys/cddl/contrib/opensolaris/uts/common/sys/idmap.h#1 branch .. //depot/projects/arp-v2/src/sys/cddl/contrib/opensolaris/uts/common/sys/isa_defs.h#4 integrate .. //depot/projects/arp-v2/src/sys/cddl/contrib/opensolaris/uts/common/sys/list.h#2 integrate .. //depot/projects/arp-v2/src/sys/cddl/contrib/opensolaris/uts/common/sys/nvpair.h#2 integrate .. //depot/projects/arp-v2/src/sys/cddl/contrib/opensolaris/uts/common/sys/processor.h#2 integrate .. //depot/projects/arp-v2/src/sys/cddl/contrib/opensolaris/uts/common/sys/synch.h#2 integrate .. //depot/projects/arp-v2/src/sys/cddl/contrib/opensolaris/uts/common/sys/sysevent/eventdefs.h#1 branch .. //depot/projects/arp-v2/src/sys/cddl/contrib/opensolaris/uts/common/sys/sysmacros.h#2 integrate .. //depot/projects/arp-v2/src/sys/cddl/contrib/opensolaris/uts/common/sys/u8_textprep.h#1 branch .. //depot/projects/arp-v2/src/sys/cddl/contrib/opensolaris/uts/common/sys/u8_textprep_data.h#1 branch .. //depot/projects/arp-v2/src/sys/cddl/contrib/opensolaris/uts/common/sys/vnode.h#1 branch .. //depot/projects/arp-v2/src/sys/cddl/contrib/opensolaris/uts/common/zmod/zmod.c#2 integrate .. //depot/projects/arp-v2/src/sys/compat/linux/linux_futex.c#5 integrate .. //depot/projects/arp-v2/src/sys/conf/files#9 integrate .. //depot/projects/arp-v2/src/sys/conf/options#8 integrate .. //depot/projects/arp-v2/src/sys/crypto/via/padlock.c#4 integrate .. //depot/projects/arp-v2/src/sys/dev/acpica/acpi.c#5 integrate .. //depot/projects/arp-v2/src/sys/dev/cardbus/cardbus.c#2 integrate .. //depot/projects/arp-v2/src/sys/dev/cardbus/cardbus_cis.c#3 integrate .. //depot/projects/arp-v2/src/sys/dev/cardbus/cardbus_device.c#2 integrate .. //depot/projects/arp-v2/src/sys/dev/cardbus/cardbusvar.h#2 integrate .. //depot/projects/arp-v2/src/sys/dev/fdc/fdc.c#3 integrate .. //depot/projects/arp-v2/src/sys/dev/glxsb/glxsb.c#2 integrate .. //depot/projects/arp-v2/src/sys/dev/hwpmc/hwpmc_amd.c#4 integrate .. //depot/projects/arp-v2/src/sys/dev/hwpmc/hwpmc_intel.c#2 integrate .. //depot/projects/arp-v2/src/sys/dev/hwpmc/hwpmc_mod.c#5 integrate .. //depot/projects/arp-v2/src/sys/dev/ipmi/ipmi.c#3 integrate .. //depot/projects/arp-v2/src/sys/dev/mfi/mfi.c#7 integrate .. //depot/projects/arp-v2/src/sys/dev/mfi/mfi_disk.c#2 integrate .. //depot/projects/arp-v2/src/sys/dev/ppbus/if_plip.c#3 integrate .. //depot/projects/arp-v2/src/sys/dev/ppbus/immio.c#3 integrate .. //depot/projects/arp-v2/src/sys/dev/ppbus/lpbb.c#4 integrate .. //depot/projects/arp-v2/src/sys/dev/ppbus/lpt.c#3 integrate .. //depot/projects/arp-v2/src/sys/dev/ppbus/lpt.h#2 integrate .. //depot/projects/arp-v2/src/sys/dev/ppbus/pcfclock.c#3 integrate .. //depot/projects/arp-v2/src/sys/dev/ppbus/ppb_1284.c#2 integrate .. //depot/projects/arp-v2/src/sys/dev/ppbus/ppb_base.c#3 integrate .. //depot/projects/arp-v2/src/sys/dev/ppbus/ppb_msq.c#3 integrate .. //depot/projects/arp-v2/src/sys/dev/ppbus/ppbconf.c#4 integrate .. //depot/projects/arp-v2/src/sys/dev/ppbus/ppbconf.h#4 integrate .. //depot/projects/arp-v2/src/sys/dev/ppbus/ppi.c#3 integrate .. //depot/projects/arp-v2/src/sys/dev/ppbus/ppi.h#2 integrate .. //depot/projects/arp-v2/src/sys/dev/ppbus/pps.c#3 integrate .. //depot/projects/arp-v2/src/sys/dev/ppbus/vpo.c#3 integrate .. //depot/projects/arp-v2/src/sys/dev/ppbus/vpoio.c#3 integrate .. //depot/projects/arp-v2/src/sys/dev/ppbus/vpoio.h#3 integrate .. //depot/projects/arp-v2/src/sys/dev/ppc/ppc.c#3 integrate .. //depot/projects/arp-v2/src/sys/dev/ppc/ppc_acpi.c#3 integrate .. //depot/projects/arp-v2/src/sys/dev/sio/sio_pci.c#2 integrate .. //depot/projects/arp-v2/src/sys/dev/sio/sio_puc.c#2 integrate .. //depot/projects/arp-v2/src/sys/dev/sound/pci/hda/hdac.c#7 integrate .. //depot/projects/arp-v2/src/sys/dev/syscons/syscons.c#6 integrate .. //depot/projects/arp-v2/src/sys/dev/vr/if_vr.c#3 integrate .. //depot/projects/arp-v2/src/sys/geom/part/g_part_bsd.c#7 integrate .. //depot/projects/arp-v2/src/sys/gnu/fs/xfs/FreeBSD/xfs_vnode.h#3 integrate .. //depot/projects/arp-v2/src/sys/gnu/fs/xfs/xfs_dfrag.c#2 integrate .. //depot/projects/arp-v2/src/sys/gnu/fs/xfs/xfs_inode.c#2 integrate .. //depot/projects/arp-v2/src/sys/gnu/fs/xfs/xfs_inode.h#2 integrate .. //depot/projects/arp-v2/src/sys/gnu/fs/xfs/xfs_vnodeops.c#2 integrate .. //depot/projects/arp-v2/src/sys/i386/conf/XEN#2 integrate .. //depot/projects/arp-v2/src/sys/i386/linux/linux.h#4 integrate .. //depot/projects/arp-v2/src/sys/isa/isa_common.c#3 integrate .. //depot/projects/arp-v2/src/sys/isa/isa_common.h#3 integrate .. //depot/projects/arp-v2/src/sys/isa/isahint.c#2 integrate .. //depot/projects/arp-v2/src/sys/isa/isavar.h#3 integrate .. //depot/projects/arp-v2/src/sys/kern/bus_if.m#3 integrate .. //depot/projects/arp-v2/src/sys/kern/kern_jail.c#6 integrate .. //depot/projects/arp-v2/src/sys/kern/kern_osd.c#1 branch .. //depot/projects/arp-v2/src/sys/kern/kern_proc.c#6 integrate .. //depot/projects/arp-v2/src/sys/kern/kern_thread.c#7 integrate .. //depot/projects/arp-v2/src/sys/kern/sched_ule.c#8 integrate .. //depot/projects/arp-v2/src/sys/kern/subr_bus.c#7 integrate .. //depot/projects/arp-v2/src/sys/kern/subr_prf.c#3 integrate .. //depot/projects/arp-v2/src/sys/kern/vfs_lookup.c#4 integrate .. //depot/projects/arp-v2/src/sys/kern/vfs_subr.c#7 integrate .. //depot/projects/arp-v2/src/sys/kern/vfs_vnops.c#6 integrate .. //depot/projects/arp-v2/src/sys/modules/cxgb/iw_cxgb/Makefile#3 integrate .. //depot/projects/arp-v2/src/sys/modules/cxgb/toecore/Makefile#3 integrate .. //depot/projects/arp-v2/src/sys/modules/zfs/Makefile#5 integrate .. //depot/projects/arp-v2/src/sys/nfsclient/nfs.h#4 integrate .. //depot/projects/arp-v2/src/sys/nfsserver/nfs.h#3 integrate .. //depot/projects/arp-v2/src/sys/powerpc/include/float.h#3 integrate .. //depot/projects/arp-v2/src/sys/security/audit/audit.c#6 integrate .. //depot/projects/arp-v2/src/sys/security/audit/audit_arg.c#7 integrate .. //depot/projects/arp-v2/src/sys/security/audit/audit_syscalls.c#6 integrate .. //depot/projects/arp-v2/src/sys/sparc64/include/iommureg.h#2 integrate .. //depot/projects/arp-v2/src/sys/sparc64/include/iommuvar.h#3 integrate .. //depot/projects/arp-v2/src/sys/sparc64/sparc64/iommu.c#4 integrate .. //depot/projects/arp-v2/src/sys/sparc64/sparc64/machdep.c#5 integrate .. //depot/projects/arp-v2/src/sys/sparc64/sparc64/support.S#3 integrate .. //depot/projects/arp-v2/src/sys/sys/conf.h#6 integrate .. //depot/projects/arp-v2/src/sys/sys/jail.h#4 integrate .. //depot/projects/arp-v2/src/sys/sys/mount.h#6 integrate .. //depot/projects/arp-v2/src/sys/sys/namei.h#3 integrate .. //depot/projects/arp-v2/src/sys/sys/osd.h#1 branch .. //depot/projects/arp-v2/src/sys/sys/priv.h#6 integrate .. //depot/projects/arp-v2/src/sys/sys/proc.h#7 integrate .. //depot/projects/arp-v2/src/sys/sys/vnode.h#6 integrate .. //depot/projects/arp-v2/src/sys/vm/vm_pageout.c#5 integrate .. //depot/projects/arp-v2/src/sys/xen/xenbus/xenbus_xs.c#2 integrate .. //depot/projects/arp-v2/src/tools/regression/zfs/LICENSE#1 branch .. //depot/projects/arp-v2/src/tools/regression/zfs/misc.sh#1 branch .. //depot/projects/arp-v2/src/tools/regression/zfs/zpool/add/cache.t#1 branch .. //depot/projects/arp-v2/src/tools/regression/zfs/zpool/add/disks.t#1 branch .. //depot/projects/arp-v2/src/tools/regression/zfs/zpool/add/doesnt_exist.t#1 branch .. //depot/projects/arp-v2/src/tools/regression/zfs/zpool/add/files.t#1 branch .. //depot/projects/arp-v2/src/tools/regression/zfs/zpool/add/log.t#1 branch .. //depot/projects/arp-v2/src/tools/regression/zfs/zpool/add/mirror.t#1 branch .. //depot/projects/arp-v2/src/tools/regression/zfs/zpool/add/option-f_inuse.t#1 branch .. //depot/projects/arp-v2/src/tools/regression/zfs/zpool/add/option-f_replication_level_mismatch_0.t#1 branch .. //depot/projects/arp-v2/src/tools/regression/zfs/zpool/add/option-f_replication_level_mismatch_1.t#1 branch .. //depot/projects/arp-v2/src/tools/regression/zfs/zpool/add/option-f_size_mismatch.t#1 branch .. //depot/projects/arp-v2/src/tools/regression/zfs/zpool/add/option-f_type_mismatch.t#1 branch .. //depot/projects/arp-v2/src/tools/regression/zfs/zpool/add/option-n.t#1 branch .. //depot/projects/arp-v2/src/tools/regression/zfs/zpool/add/raidz1.t#1 branch .. //depot/projects/arp-v2/src/tools/regression/zfs/zpool/add/raidz2.t#1 branch .. //depot/projects/arp-v2/src/tools/regression/zfs/zpool/add/spare.t#1 branch .. //depot/projects/arp-v2/src/tools/regression/zfs/zpool/attach/log.t#1 branch .. //depot/projects/arp-v2/src/tools/regression/zfs/zpool/attach/mirror.t#1 branch .. //depot/projects/arp-v2/src/tools/regression/zfs/zpool/attach/option-f_inuse.t#1 branch .. //depot/projects/arp-v2/src/tools/regression/zfs/zpool/create/already_exists.t#1 branch .. //depot/projects/arp-v2/src/tools/regression/zfs/zpool/create/automount.t#1 branch .. //depot/projects/arp-v2/src/tools/regression/zfs/zpool/create/cache.t#1 branch .. //depot/projects/arp-v2/src/tools/regression/zfs/zpool/create/disks.t#1 branch .. //depot/projects/arp-v2/src/tools/regression/zfs/zpool/create/files.t#1 branch .. //depot/projects/arp-v2/src/tools/regression/zfs/zpool/create/log.t#1 branch .. //depot/projects/arp-v2/src/tools/regression/zfs/zpool/create/mirror.t#1 branch .. //depot/projects/arp-v2/src/tools/regression/zfs/zpool/create/option-R.t#1 branch .. //depot/projects/arp-v2/src/tools/regression/zfs/zpool/create/option-f_inuse.t#1 branch .. //depot/projects/arp-v2/src/tools/regression/zfs/zpool/create/option-f_replication_level_mismatch_0.t#1 branch .. //depot/projects/arp-v2/src/tools/regression/zfs/zpool/create/option-f_replication_level_mismatch_1.t#1 branch .. //depot/projects/arp-v2/src/tools/regression/zfs/zpool/create/option-f_size_mismatch.t#1 branch .. //depot/projects/arp-v2/src/tools/regression/zfs/zpool/create/option-f_type_mismatch.t#1 branch .. //depot/projects/arp-v2/src/tools/regression/zfs/zpool/create/option-m.t#1 branch .. //depot/projects/arp-v2/src/tools/regression/zfs/zpool/create/option-n.t#1 branch .. //depot/projects/arp-v2/src/tools/regression/zfs/zpool/create/option-o.t#1 branch .. //depot/projects/arp-v2/src/tools/regression/zfs/zpool/create/raidz1.t#1 branch .. //depot/projects/arp-v2/src/tools/regression/zfs/zpool/create/raidz2.t#1 branch .. //depot/projects/arp-v2/src/tools/regression/zfs/zpool/create/spare.t#1 branch .. //depot/projects/arp-v2/src/tools/regression/zfs/zpool/offline/io.t#1 branch .. //depot/projects/arp-v2/src/tools/regression/zfs/zpool/offline/log.t#1 branch .. //depot/projects/arp-v2/src/tools/regression/zfs/zpool/offline/mirror.t#1 branch .. //depot/projects/arp-v2/src/tools/regression/zfs/zpool/offline/option-t.t#1 branch .. //depot/projects/arp-v2/src/tools/regression/zfs/zpool/offline/raidz1.t#1 branch .. //depot/projects/arp-v2/src/tools/regression/zfs/zpool/offline/raidz2.t#1 branch .. //depot/projects/arp-v2/src/tools/regression/zfs/zpool/remove/cache.t#1 branch .. //depot/projects/arp-v2/src/tools/regression/zfs/zpool/remove/spare.t#1 branch .. //depot/projects/arp-v2/src/tools/regression/zfs/zpool/replace/cache.t#1 branch .. //depot/projects/arp-v2/src/tools/regression/zfs/zpool/replace/disk.t#1 branch .. //depot/projects/arp-v2/src/tools/regression/zfs/zpool/replace/log.t#1 branch .. //depot/projects/arp-v2/src/tools/regression/zfs/zpool/replace/mirror.t#1 branch .. //depot/projects/arp-v2/src/tools/regression/zfs/zpool/replace/raidz1.t#1 branch .. //depot/projects/arp-v2/src/tools/regression/zfs/zpool/replace/raidz2.t#1 branch .. //depot/projects/arp-v2/src/tools/regression/zfs/zpool/replace/spare.t#1 branch .. //depot/projects/arp-v2/src/usr.bin/calendar/calendars/calendar.freebsd#6 integrate .. //depot/projects/arp-v2/src/usr.bin/lsvfs/lsvfs.c#2 integrate .. //depot/projects/arp-v2/src/usr.sbin/Makefile#6 integrate .. //depot/projects/arp-v2/src/usr.sbin/cron/crontab/Makefile#3 integrate .. //depot/projects/arp-v2/src/usr.sbin/cron/crontab/crontab.c#3 integrate .. //depot/projects/arp-v2/src/usr.sbin/cron/lib/Makefile#3 integrate .. //depot/projects/arp-v2/src/usr.sbin/cron/lib/misc.c#3 integrate .. //depot/projects/arp-v2/src/usr.sbin/dumpcis/Makefile#1 branch .. //depot/projects/arp-v2/src/usr.sbin/dumpcis/dumpcis.8#1 branch .. //depot/projects/arp-v2/src/usr.sbin/dumpcis/dumpcis.c#1 branch .. //depot/projects/arp-v2/src/usr.sbin/dumpcis/dumpcisfile.c#1 branch .. //depot/projects/arp-v2/src/usr.sbin/dumpcis/main.c#1 branch .. //depot/projects/arp-v2/src/usr.sbin/dumpcis/printcis.c#1 branch .. //depot/projects/arp-v2/src/usr.sbin/dumpcis/readcis.c#1 branch .. //depot/projects/arp-v2/src/usr.sbin/dumpcis/readcis.h#1 branch .. //depot/projects/arp-v2/src/usr.sbin/pccard/Makefile#2 delete .. //depot/projects/arp-v2/src/usr.sbin/pccard/Makefile.inc#2 delete .. //depot/projects/arp-v2/src/usr.sbin/pccard/dumpcis/Makefile#2 delete .. //depot/projects/arp-v2/src/usr.sbin/pccard/dumpcis/dumpcis.8#2 delete .. //depot/projects/arp-v2/src/usr.sbin/pccard/dumpcis/main.c#2 delete .. //depot/projects/arp-v2/src/usr.sbin/pccard/pccardc/Makefile#2 delete .. //depot/projects/arp-v2/src/usr.sbin/pccard/pccardc/beep.c#2 delete .. //depot/projects/arp-v2/src/usr.sbin/pccard/pccardc/dumpcis.c#2 delete .. //depot/projects/arp-v2/src/usr.sbin/pccard/pccardc/dumpcisfile.c#2 delete .. //depot/projects/arp-v2/src/usr.sbin/pccard/pccardc/enabler.c#2 delete .. //depot/projects/arp-v2/src/usr.sbin/pccard/pccardc/pccardc.8#2 delete .. //depot/projects/arp-v2/src/usr.sbin/pccard/pccardc/pccardc.c#2 delete .. //depot/projects/arp-v2/src/usr.sbin/pccard/pccardc/pccardmem.c#2 delete .. //depot/projects/arp-v2/src/usr.sbin/pccard/pccardc/power.c#2 delete .. //depot/projects/arp-v2/src/usr.sbin/pccard/pccardc/printcis.c#2 delete .. //depot/projects/arp-v2/src/usr.sbin/pccard/pccardc/rdattr.c#2 delete .. //depot/projects/arp-v2/src/usr.sbin/pccard/pccardc/rdmap.c#2 delete .. //depot/projects/arp-v2/src/usr.sbin/pccard/pccardc/rdreg.c#2 delete .. //depot/projects/arp-v2/src/usr.sbin/pccard/pccardc/wrattr.c#2 delete .. //depot/projects/arp-v2/src/usr.sbin/pccard/pccardc/wrreg.c#2 delete .. //depot/projects/arp-v2/src/usr.sbin/pccard/pccardd/readcis.c#2 delete .. //depot/projects/arp-v2/src/usr.sbin/pccard/pccardd/readcis.h#2 delete .. //depot/projects/arp-v2/src/usr.sbin/pmccontrol/pmccontrol.c#3 integrate .. //depot/projects/arp-v2/src/usr.sbin/powerd/powerd.8#3 integrate .. //depot/projects/arp-v2/src/usr.sbin/powerd/powerd.c#4 integrate .. //depot/projects/arp-v2/src/usr.sbin/zic/zic.8#2 integrate Differences ... ==== //depot/projects/arp-v2/src/cddl/compat/opensolaris/include/mnttab.h#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/cddl/compat/opensolaris/include/mnttab.h,v 1.3 2008/04/22 07:42:58 jb Exp $ */ +/* $FreeBSD: src/cddl/compat/opensolaris/include/mnttab.h,v 1.4 2008/11/17 20:49:29 pjd Exp $ */ #ifndef _OPENSOLARIS_MNTTAB_H_ #define _OPENSOLARIS_MNTTAB_H_ @@ -9,6 +9,8 @@ #define MNTTAB _PATH_DEVNULL #define MNT_LINE_MAX 1024 +#define umount2(p, f) unmount(p, f) + struct mnttab { char *mnt_special; char *mnt_mountp; ==== //depot/projects/arp-v2/src/cddl/compat/opensolaris/misc/mnttab.c#2 (text+ko) ==== @@ -30,13 +30,15 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/cddl/compat/opensolaris/misc/mnttab.c,v 1.2 2008/03/28 22:16:05 jb Exp $"); +__FBSDID("$FreeBSD: src/cddl/compat/opensolaris/misc/mnttab.c,v 1.3 2008/11/17 20:49:29 pjd Exp $"); #include <sys/param.h> #include <sys/mount.h> #include <sys/mntent.h> #include <sys/mnttab.h> #include <stdio.h> +#include <stdlib.h> +#include <string.h> static char * mntopt(char **p) ==== //depot/projects/arp-v2/src/cddl/compat/opensolaris/misc/zmount.c#2 (text+ko) ==== @@ -29,15 +29,16 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/cddl/compat/opensolaris/misc/zmount.c,v 1.2 2008/03/28 22:16:05 jb Exp $"); +__FBSDID("$FreeBSD: src/cddl/compat/opensolaris/misc/zmount.c,v 1.3 2008/11/17 20:49:29 pjd Exp $"); #include <sys/param.h> #include <sys/mount.h> #include <sys/uio.h> #include <sys/mntent.h> +#include <assert.h> #include <stdio.h> #include <stdlib.h> -#include <assert.h> +#include <string.h> static void build_iovec(struct iovec **iov, int *iovlen, const char *name, void *val, @@ -86,7 +87,7 @@ assert(optlen > 0); optstr = strdup(optptr); - assert(optptr != NULL); + assert(optstr != NULL); iov = NULL; iovlen = 0; ==== //depot/projects/arp-v2/src/cddl/compat/opensolaris/misc/zone.c#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/misc/zone.c,v 1.2 2008/03/28 22:16:05 jb Exp $ + * $FreeBSD: src/cddl/compat/opensolaris/misc/zone.c,v 1.3 2008/11/17 20:49:29 pjd Exp $ */ #include <stdlib.h> @@ -32,7 +32,7 @@ #include <sys/sysctl.h> #include <sys/zone.h> -int +zoneid_t getzoneid(void) { size_t size; @@ -42,5 +42,5 @@ size = sizeof(jailid); if (sysctlbyname("security.jail.jailed", &jailid, &size, NULL, 0) == -1) assert(!"No security.jail.jailed sysctl!"); - return (jailid); + return ((zoneid_t)jailid); } ==== //depot/projects/arp-v2/src/cddl/contrib/opensolaris/cmd/zdb/zdb.8#2 (text+ko) ==== @@ -28,13 +28,17 @@ .fi .SH DESCRIPTION +.sp .LP The \fBzdb\fR command is used by support engineers to diagnose failures and gather statistics. Since the \fBZFS\fR file system is always consistent on disk and is self-repairing, \fBzdb\fR should only be run under the direction by a support engineer. +.sp .LP If no arguments are specified, \fBzdb\fR, performs basic consistency checks on the pool and associated datasets, and report any problems detected. +.sp .LP Any options supported by this command are internal to Sun and subject to change at any time. .SH EXIT STATUS +.sp .LP The following exit values are returned: .sp @@ -71,6 +75,7 @@ .RE .SH ATTRIBUTES +.sp .LP See \fBattributes\fR(5) for descriptions of the following attributes: .sp @@ -89,5 +94,6 @@ .TE .SH SEE ALSO +.sp .LP \fBzfs\fR(1M), \fBzpool\fR(1M), \fBattributes\fR(5) ==== //depot/projects/arp-v2/src/cddl/contrib/opensolaris/cmd/zdb/zdb.c#2 (text+ko) ==== @@ -19,12 +19,10 @@ * CDDL HEADER END */ /* - * Copyright 2007 Sun Microsystems, Inc. All rights reserved. + * Copyright 2008 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - #include <stdio.h> #include <stdio_ext.h> #include <stdlib.h> @@ -51,6 +49,10 @@ #include <sys/dmu_traverse.h> #include <sys/zio_checksum.h> #include <sys/zio_compress.h> +#include <sys/zfs_fuid.h> +#undef ZFS_MAXNAMELEN +#undef verify +#include <libzfs.h> const char cmdname[] = "zdb"; uint8_t dump_opt[256]; @@ -62,6 +64,9 @@ int zopt_objects = 0; int zdb_advance = ADVANCE_PRE; zbookmark_t zdb_noread = { 0, 0, ZB_NO_LEVEL, 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 @@ -83,12 +88,15 @@ usage(void) { (void) fprintf(stderr, - "Usage: %s [-udibcsvLU] [-O order] [-B os:obj:level:blkid] " + "Usage: %s [-udibcsvL] [-U cachefile_path] [-O order] " + "[-B os:obj:level:blkid] [-S user:cksumalg] " "dataset [object...]\n" " %s -C [pool]\n" " %s -l dev\n" - " %s -R vdev:offset:size:flags\n", - cmdname, cmdname, cmdname, cmdname); + " %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); (void) fprintf(stderr, " -u uberblock\n"); (void) fprintf(stderr, " -d datasets\n"); @@ -97,16 +105,22 @@ (void) fprintf(stderr, " -b block statistics\n"); (void) fprintf(stderr, " -c checksum 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, " -l dump label contents\n"); (void) fprintf(stderr, " -L live pool (allows some errors)\n"); (void) fprintf(stderr, " -O [!]<pre|post|prune|data|holes> " "visitation order\n"); - (void) fprintf(stderr, " -U use zpool.cache in /tmp\n"); + (void) fprintf(stderr, " -U cachefile_path -- use alternate " + "cachefile\n"); (void) fprintf(stderr, " -B objset:object:level:blkid -- " "simulate bad block\n"); - (void) fprintf(stderr, " -R read and display block from a" + (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, "Specify an option more than once (e.g. -bb) " "to make only that option verbose\n"); (void) fprintf(stderr, "Default is to dump everything non-verbosely\n"); @@ -367,7 +381,45 @@ zap_cursor_fini(&zc); } +/*ARGSUSED*/ static void +dump_zpldir(objset_t *os, uint64_t object, void *data, size_t size) +{ + zap_cursor_t zc; + zap_attribute_t attr; + const char *typenames[] = { + /* 0 */ "not specified", + /* 1 */ "FIFO", + /* 2 */ "Character Device", + /* 3 */ "3 (invalid)", + /* 4 */ "Directory", + /* 5 */ "5 (invalid)", + /* 6 */ "Block Device", + /* 7 */ "7 (invalid)", + /* 8 */ "Regular File", + /* 9 */ "9 (invalid)", + /* 10 */ "Symbolic Link", + /* 11 */ "11 (invalid)", + /* 12 */ "Socket", + /* 13 */ "Door", + /* 14 */ "Event Port", + /* 15 */ "15 (invalid)", + }; + + dump_zap_stats(os, object); + (void) printf("\n"); + + for (zap_cursor_init(&zc, os, object); + zap_cursor_retrieve(&zc, &attr) == 0; + zap_cursor_advance(&zc)) { + (void) printf("\t\t%s = %lld (type: %s)\n", + attr.za_name, ZFS_DIRENT_OBJ(attr.za_first_integer), + typenames[ZFS_DIRENT_TYPE(attr.za_first_integer)]); + } + zap_cursor_fini(&zc); +} + +static void dump_spacemap(objset_t *os, space_map_obj_t *smo, space_map_t *sm) { uint64_t alloc, offset, entry; @@ -456,10 +508,7 @@ for (c = 0; c < rvd->vdev_children; c++) { vd = rvd->vdev_child[c]; - spa_config_enter(spa, RW_READER, FTAG); - (void) printf("\n vdev %llu = %s\n\n", - (u_longlong_t)vd->vdev_id, vdev_description(vd)); - spa_config_exit(spa, FTAG); + (void) printf("\n vdev %llu\n\n", (u_longlong_t)vd->vdev_id); if (dump_opt['d'] <= 5) { (void) printf("\t%10s %10s %5s\n", @@ -477,7 +526,6 @@ dump_dtl(vdev_t *vd, int indent) { avl_tree_t *t = &vd->vdev_dtl_map.sm_root; - spa_t *spa = vd->vdev_spa; space_seg_t *ss; vdev_t *pvd; int c; @@ -485,9 +533,10 @@ if (indent == 0) (void) printf("\nDirty time logs:\n\n"); - spa_config_enter(spa, RW_READER, FTAG); - (void) printf("\t%*s%s\n", indent, "", vdev_description(vd)); - spa_config_exit(spa, FTAG); + (void) printf("\t%*s%s\n", indent, "", + vd->vdev_path ? vd->vdev_path : + vd->vdev_parent ? vd->vdev_ops->vdev_op_type : + spa_name(vd->vdev_spa)); for (ss = avl_first(t); ss; ss = AVL_NEXT(t, ss)) { /* @@ -670,36 +719,49 @@ { dsl_dir_phys_t *dd = data; time_t crtime; - char used[6], compressed[6], uncompressed[6], quota[6], resv[6]; + char nice[6]; if (dd == NULL) return; - ASSERT(size == sizeof (*dd)); + ASSERT3U(size, >=, sizeof (dsl_dir_phys_t)); crtime = dd->dd_creation_time; - nicenum(dd->dd_used_bytes, used); - nicenum(dd->dd_compressed_bytes, compressed); - nicenum(dd->dd_uncompressed_bytes, uncompressed); - nicenum(dd->dd_quota, quota); - nicenum(dd->dd_reserved, resv); - (void) printf("\t\tcreation_time = %s", ctime(&crtime)); (void) printf("\t\thead_dataset_obj = %llu\n", (u_longlong_t)dd->dd_head_dataset_obj); (void) printf("\t\tparent_dir_obj = %llu\n", (u_longlong_t)dd->dd_parent_obj); - (void) printf("\t\tclone_parent_obj = %llu\n", - (u_longlong_t)dd->dd_clone_parent_obj); + (void) printf("\t\torigin_obj = %llu\n", + (u_longlong_t)dd->dd_origin_obj); (void) printf("\t\tchild_dir_zapobj = %llu\n", (u_longlong_t)dd->dd_child_dir_zapobj); - (void) printf("\t\tused_bytes = %s\n", used); - (void) printf("\t\tcompressed_bytes = %s\n", compressed); - (void) printf("\t\tuncompressed_bytes = %s\n", uncompressed); - (void) printf("\t\tquota = %s\n", quota); - (void) printf("\t\treserved = %s\n", resv); + nicenum(dd->dd_used_bytes, nice); + (void) printf("\t\tused_bytes = %s\n", nice); + nicenum(dd->dd_compressed_bytes, nice); + (void) printf("\t\tcompressed_bytes = %s\n", nice); + nicenum(dd->dd_uncompressed_bytes, nice); + (void) printf("\t\tuncompressed_bytes = %s\n", nice); + nicenum(dd->dd_quota, nice); + (void) printf("\t\tquota = %s\n", nice); + nicenum(dd->dd_reserved, nice); + (void) printf("\t\treserved = %s\n", nice); (void) printf("\t\tprops_zapobj = %llu\n", (u_longlong_t)dd->dd_props_zapobj); + (void) printf("\t\tdeleg_zapobj = %llu\n", + (u_longlong_t)dd->dd_deleg_zapobj); + (void) printf("\t\tflags = %llx\n", + (u_longlong_t)dd->dd_flags); + +#define DO(which) \ + nicenum(dd->dd_used_breakdown[DD_USED_ ## which], nice); \ + (void) printf("\t\tused_breakdown[" #which "] = %s\n", nice) + DO(HEAD); + DO(SNAP); + DO(CHILD); + DO(CHILD_RSRV); + DO(REFRSRV); +#undef DO } /*ARGSUSED*/ @@ -722,7 +784,7 @@ nicenum(ds->ds_unique_bytes, unique); sprintf_blkptr(blkbuf, BP_SPRINTF_LEN, &ds->ds_bp); - (void) printf("\t\tdataset_obj = %llu\n", + (void) printf("\t\tdir_obj = %llu\n", (u_longlong_t)ds->ds_dir_obj); (void) printf("\t\tprev_snap_obj = %llu\n", (u_longlong_t)ds->ds_prev_snap_obj); @@ -749,6 +811,10 @@ (u_longlong_t)ds->ds_guid); (void) printf("\t\tflags = %llx\n", (u_longlong_t)ds->ds_flags); + (void) printf("\t\tnext_clones_obj = %llu\n", + (u_longlong_t)ds->ds_next_clones_obj); + (void) printf("\t\tprops_obj = %llu\n", + (u_longlong_t)ds->ds_props_obj); (void) printf("\t\tbp = %s\n", blkbuf); } >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200811182141.mAILfV76067912>