Date: Wed, 26 Jun 2013 18:12:38 +0000 (UTC) From: Attilio Rao <attilio@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r252255 - in user/attilio/vmobj-readlock: . cddl/contrib/opensolaris/lib/libzfs/common cddl/contrib/opensolaris/lib/libzfs_core/common contrib/gcc etc etc/devd etc/periodic/daily etc/rc... Message-ID: <201306261812.r5QICcx5014852@svn.freebsd.org>
index | next in thread | raw e-mail
Author: attilio Date: Wed Jun 26 18:12:38 2013 New Revision: 252255 URL: http://svnweb.freebsd.org/changeset/base/252255 Log: MFC Added: user/attilio/vmobj-readlock/share/man/man4/qlxge.4 - copied unchanged from r252254, user/attilio/vmcontention/share/man/man4/qlxge.4 user/attilio/vmobj-readlock/sys/dev/qlxge/ - copied from r252254, user/attilio/vmcontention/sys/dev/qlxge/ user/attilio/vmobj-readlock/sys/modules/qlxge/ - copied from r252254, user/attilio/vmcontention/sys/modules/qlxge/ Modified: user/attilio/vmobj-readlock/ObsoleteFiles.inc user/attilio/vmobj-readlock/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c user/attilio/vmobj-readlock/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_status.c user/attilio/vmobj-readlock/cddl/contrib/opensolaris/lib/libzfs_core/common/libzfs_core.c user/attilio/vmobj-readlock/contrib/gcc/config.gcc user/attilio/vmobj-readlock/contrib/gcc/gthr-posix95.h user/attilio/vmobj-readlock/contrib/gcc/opts.c user/attilio/vmobj-readlock/etc/devd/usb.conf user/attilio/vmobj-readlock/etc/network.subr user/attilio/vmobj-readlock/etc/periodic/daily/450.status-security user/attilio/vmobj-readlock/etc/rc.d/hostapd user/attilio/vmobj-readlock/gnu/lib/libdialog/Makefile user/attilio/vmobj-readlock/lib/msun/src/s_fma.c user/attilio/vmobj-readlock/lib/msun/src/s_fmal.c user/attilio/vmobj-readlock/release/doc/en_US.ISO8859-1/errata/article.xml user/attilio/vmobj-readlock/release/doc/share/xml/release.ent user/attilio/vmobj-readlock/share/man/man4/Makefile user/attilio/vmobj-readlock/share/man/man4/axe.4 user/attilio/vmobj-readlock/share/man/man4/urtwn.4 user/attilio/vmobj-readlock/share/man/man5/rc.conf.5 user/attilio/vmobj-readlock/share/man/man9/Makefile user/attilio/vmobj-readlock/share/man/man9/rmlock.9 user/attilio/vmobj-readlock/share/misc/committers-ports.dot user/attilio/vmobj-readlock/sys/arm/ti/ti_scm.c user/attilio/vmobj-readlock/sys/cam/scsi/scsi_all.c user/attilio/vmobj-readlock/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_destroy.c user/attilio/vmobj-readlock/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_userhold.c user/attilio/vmobj-readlock/sys/conf/files.amd64 user/attilio/vmobj-readlock/sys/conf/options user/attilio/vmobj-readlock/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_attach.c user/attilio/vmobj-readlock/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_freebsd.c user/attilio/vmobj-readlock/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_freebsd_inc.h user/attilio/vmobj-readlock/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_radio.c user/attilio/vmobj-readlock/sys/dev/ata/chipsets/ata-intel.c user/attilio/vmobj-readlock/sys/dev/ath/ath_hal/ah.c user/attilio/vmobj-readlock/sys/dev/ath/ath_hal/ah_internal.h user/attilio/vmobj-readlock/sys/dev/ath/if_ath_ahb.c user/attilio/vmobj-readlock/sys/dev/bge/if_bge.c user/attilio/vmobj-readlock/sys/dev/mpt/mpt_cam.c user/attilio/vmobj-readlock/sys/dev/pci/pci.c user/attilio/vmobj-readlock/sys/dev/usb/net/if_axe.c user/attilio/vmobj-readlock/sys/dev/usb/usbdevs user/attilio/vmobj-readlock/sys/dev/usb/wlan/if_urtwn.c user/attilio/vmobj-readlock/sys/kern/kern_cpuset.c user/attilio/vmobj-readlock/sys/kern/kern_lock.c user/attilio/vmobj-readlock/sys/kern/kern_mutex.c user/attilio/vmobj-readlock/sys/kern/kern_rmlock.c user/attilio/vmobj-readlock/sys/kern/kern_rwlock.c user/attilio/vmobj-readlock/sys/kern/kern_sx.c user/attilio/vmobj-readlock/sys/kern/subr_lock.c user/attilio/vmobj-readlock/sys/mips/conf/AR933X_BASE user/attilio/vmobj-readlock/sys/mips/conf/AR933X_BASE.hints user/attilio/vmobj-readlock/sys/mips/conf/CARAMBOLA2.hints user/attilio/vmobj-readlock/sys/modules/Makefile user/attilio/vmobj-readlock/sys/net/route.h user/attilio/vmobj-readlock/sys/net/rtsock.c user/attilio/vmobj-readlock/sys/netinet6/nd6_rtr.c user/attilio/vmobj-readlock/sys/sys/_rmlock.h user/attilio/vmobj-readlock/sys/sys/cpuset.h user/attilio/vmobj-readlock/sys/sys/lock.h user/attilio/vmobj-readlock/sys/sys/rmlock.h user/attilio/vmobj-readlock/sys/vm/uma.h user/attilio/vmobj-readlock/sys/vm/uma_core.c user/attilio/vmobj-readlock/sys/vm/uma_int.h user/attilio/vmobj-readlock/sys/vm/vm_page.c user/attilio/vmobj-readlock/tools/build/mk/OptionalObsoleteFiles.inc user/attilio/vmobj-readlock/tools/tools/ath/Makefile.inc user/attilio/vmobj-readlock/usr.bin/calendar/calendars/calendar.freebsd user/attilio/vmobj-readlock/usr.bin/sed/main.c user/attilio/vmobj-readlock/usr.sbin/bsdconfig/bsdconfig user/attilio/vmobj-readlock/usr.sbin/bsdconfig/console/console user/attilio/vmobj-readlock/usr.sbin/bsdconfig/console/font user/attilio/vmobj-readlock/usr.sbin/bsdconfig/console/keymap user/attilio/vmobj-readlock/usr.sbin/bsdconfig/console/repeat user/attilio/vmobj-readlock/usr.sbin/bsdconfig/console/saver user/attilio/vmobj-readlock/usr.sbin/bsdconfig/console/screenmap user/attilio/vmobj-readlock/usr.sbin/bsdconfig/console/ttys user/attilio/vmobj-readlock/usr.sbin/bsdconfig/diskmgmt/diskmgmt user/attilio/vmobj-readlock/usr.sbin/bsdconfig/docsinstall/docsinstall user/attilio/vmobj-readlock/usr.sbin/bsdconfig/dot/dot user/attilio/vmobj-readlock/usr.sbin/bsdconfig/mouse/disable user/attilio/vmobj-readlock/usr.sbin/bsdconfig/mouse/enable user/attilio/vmobj-readlock/usr.sbin/bsdconfig/mouse/flags user/attilio/vmobj-readlock/usr.sbin/bsdconfig/mouse/mouse user/attilio/vmobj-readlock/usr.sbin/bsdconfig/mouse/port user/attilio/vmobj-readlock/usr.sbin/bsdconfig/mouse/type user/attilio/vmobj-readlock/usr.sbin/bsdconfig/networking/defaultrouter user/attilio/vmobj-readlock/usr.sbin/bsdconfig/networking/devices user/attilio/vmobj-readlock/usr.sbin/bsdconfig/networking/hostname user/attilio/vmobj-readlock/usr.sbin/bsdconfig/networking/nameservers user/attilio/vmobj-readlock/usr.sbin/bsdconfig/networking/networking user/attilio/vmobj-readlock/usr.sbin/bsdconfig/networking/share/device.subr user/attilio/vmobj-readlock/usr.sbin/bsdconfig/networking/share/hostname.subr user/attilio/vmobj-readlock/usr.sbin/bsdconfig/networking/share/ipaddr.subr user/attilio/vmobj-readlock/usr.sbin/bsdconfig/networking/share/media.subr user/attilio/vmobj-readlock/usr.sbin/bsdconfig/networking/share/netmask.subr user/attilio/vmobj-readlock/usr.sbin/bsdconfig/networking/share/resolv.subr user/attilio/vmobj-readlock/usr.sbin/bsdconfig/packages/packages user/attilio/vmobj-readlock/usr.sbin/bsdconfig/password/password user/attilio/vmobj-readlock/usr.sbin/bsdconfig/security/kern_securelevel user/attilio/vmobj-readlock/usr.sbin/bsdconfig/security/security user/attilio/vmobj-readlock/usr.sbin/bsdconfig/share/common.subr user/attilio/vmobj-readlock/usr.sbin/bsdconfig/share/device.subr user/attilio/vmobj-readlock/usr.sbin/bsdconfig/share/dialog.subr user/attilio/vmobj-readlock/usr.sbin/bsdconfig/share/media/tcpip.subr user/attilio/vmobj-readlock/usr.sbin/bsdconfig/share/packages/packages.subr user/attilio/vmobj-readlock/usr.sbin/bsdconfig/share/sysrc.subr user/attilio/vmobj-readlock/usr.sbin/bsdconfig/startup/misc user/attilio/vmobj-readlock/usr.sbin/bsdconfig/startup/rcadd user/attilio/vmobj-readlock/usr.sbin/bsdconfig/startup/rcconf user/attilio/vmobj-readlock/usr.sbin/bsdconfig/startup/rcdelete user/attilio/vmobj-readlock/usr.sbin/bsdconfig/startup/rcedit user/attilio/vmobj-readlock/usr.sbin/bsdconfig/startup/rcvar user/attilio/vmobj-readlock/usr.sbin/bsdconfig/startup/startup user/attilio/vmobj-readlock/usr.sbin/bsdconfig/timezone/timezone user/attilio/vmobj-readlock/usr.sbin/bsdconfig/ttys/ttys user/attilio/vmobj-readlock/usr.sbin/bsdconfig/usermgmt/groupadd user/attilio/vmobj-readlock/usr.sbin/bsdconfig/usermgmt/groupdel user/attilio/vmobj-readlock/usr.sbin/bsdconfig/usermgmt/groupedit user/attilio/vmobj-readlock/usr.sbin/bsdconfig/usermgmt/groupinput user/attilio/vmobj-readlock/usr.sbin/bsdconfig/usermgmt/share/user_input.subr user/attilio/vmobj-readlock/usr.sbin/bsdconfig/usermgmt/useradd user/attilio/vmobj-readlock/usr.sbin/bsdconfig/usermgmt/userdel user/attilio/vmobj-readlock/usr.sbin/bsdconfig/usermgmt/useredit user/attilio/vmobj-readlock/usr.sbin/bsdconfig/usermgmt/userinput user/attilio/vmobj-readlock/usr.sbin/bsdconfig/usermgmt/usermgmt user/attilio/vmobj-readlock/usr.sbin/gssd/gssd.8 user/attilio/vmobj-readlock/usr.sbin/gssd/gssd.c user/attilio/vmobj-readlock/usr.sbin/mergemaster/mergemaster.8 Directory Properties: user/attilio/vmobj-readlock/ (props changed) user/attilio/vmobj-readlock/cddl/ (props changed) user/attilio/vmobj-readlock/cddl/contrib/opensolaris/ (props changed) user/attilio/vmobj-readlock/cddl/contrib/opensolaris/lib/libzfs/ (props changed) user/attilio/vmobj-readlock/contrib/gcc/ (props changed) user/attilio/vmobj-readlock/gnu/lib/ (props changed) user/attilio/vmobj-readlock/share/man/man4/ (props changed) user/attilio/vmobj-readlock/sys/ (props changed) user/attilio/vmobj-readlock/sys/cddl/contrib/opensolaris/ (props changed) user/attilio/vmobj-readlock/sys/conf/ (props changed) user/attilio/vmobj-readlock/usr.bin/calendar/ (props changed) Modified: user/attilio/vmobj-readlock/ObsoleteFiles.inc ============================================================================== --- user/attilio/vmobj-readlock/ObsoleteFiles.inc Wed Jun 26 18:07:51 2013 (r252254) +++ user/attilio/vmobj-readlock/ObsoleteFiles.inc Wed Jun 26 18:12:38 2013 (r252255) @@ -38,6 +38,9 @@ # xargs -n1 | sort | uniq -d; # done +# 20130623: dialog update from 1.1 to 1.2 +OLD_LIBS+=usr/lib/libdialog.so.7 +OLD_LIBS+=usr/lib32/libdialog.so.7 # 20130616: vfs_mounted.9 removed OLD_FILES+=usr/share/man/man9/vfs_mount.9.gz # 20130614: remove CVS from base Modified: user/attilio/vmobj-readlock/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c ============================================================================== --- user/attilio/vmobj-readlock/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c Wed Jun 26 18:07:51 2013 (r252254) +++ user/attilio/vmobj-readlock/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c Wed Jun 26 18:12:38 2013 (r252255) @@ -21,9 +21,9 @@ /* * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. - * Copyright 2012 Nexenta Systems, Inc. All rights reserved. - * Copyright (c) 2011 by Delphix. All rights reserved. + * Copyright (c) 2013 by Delphix. All rights reserved. * Copyright (c) 2012 DEY Storage Systems, Inc. All rights reserved. + * Copyright 2012 Nexenta Systems, Inc. All rights reserved. * Copyright (c) 2011-2012 Pawel Jakub Dawidek <pawel@dawidek.net>. * All rights reserved. * Copyright (c) 2012 Martin Matuska <mm@FreeBSD.org>. All rights reserved. @@ -4159,6 +4159,7 @@ struct holdarg { const char *snapname; const char *tag; boolean_t recursive; + int error; }; static int @@ -4286,15 +4287,20 @@ zfs_release_one(zfs_handle_t *zhp, void struct holdarg *ha = arg; char name[ZFS_MAXNAMELEN]; int rv = 0; + nvlist_t *existing_holds; (void) snprintf(name, sizeof (name), "%s@%s", zhp->zfs_name, ha->snapname); - if (lzc_exists(name)) { - nvlist_t *holds = fnvlist_alloc(); - fnvlist_add_boolean(holds, ha->tag); - fnvlist_add_nvlist(ha->nvl, name, holds); - fnvlist_free(holds); + if (lzc_get_holds(name, &existing_holds) != 0) { + ha->error = ENOENT; + } else if (!nvlist_exists(existing_holds, ha->tag)) { + ha->error = ESRCH; + } else { + nvlist_t *torelease = fnvlist_alloc(); + fnvlist_add_boolean(torelease, ha->tag); + fnvlist_add_nvlist(ha->nvl, name, torelease); + fnvlist_free(torelease); } if (ha->recursive) @@ -4318,16 +4324,21 @@ zfs_release(zfs_handle_t *zhp, const cha ha.snapname = snapname; ha.tag = tag; ha.recursive = recursive; + ha.error = 0; (void) zfs_release_one(zfs_handle_dup(zhp), &ha); if (nvlist_empty(ha.nvl)) { fnvlist_free(ha.nvl); - ret = ENOENT; + ret = ha.error; (void) snprintf(errbuf, sizeof (errbuf), dgettext(TEXT_DOMAIN, "cannot release hold from snapshot '%s@%s'"), zhp->zfs_name, snapname); - (void) zfs_standard_error(hdl, ret, errbuf); + if (ret == ESRCH) { + (void) zfs_error(hdl, EZFS_REFTAG_RELE, errbuf); + } else { + (void) zfs_standard_error(hdl, ret, errbuf); + } return (ret); } Modified: user/attilio/vmobj-readlock/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_status.c ============================================================================== --- user/attilio/vmobj-readlock/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_status.c Wed Jun 26 18:07:51 2013 (r252254) +++ user/attilio/vmobj-readlock/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_status.c Wed Jun 26 18:12:38 2013 (r252255) @@ -22,6 +22,7 @@ /* * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2012 by Delphix. All rights reserved. + * Copyright (c) 2013 Steven Hartland. All rights reserved. */ /* Modified: user/attilio/vmobj-readlock/cddl/contrib/opensolaris/lib/libzfs_core/common/libzfs_core.c ============================================================================== --- user/attilio/vmobj-readlock/cddl/contrib/opensolaris/lib/libzfs_core/common/libzfs_core.c Wed Jun 26 18:07:51 2013 (r252254) +++ user/attilio/vmobj-readlock/cddl/contrib/opensolaris/lib/libzfs_core/common/libzfs_core.c Wed Jun 26 18:12:38 2013 (r252255) @@ -302,11 +302,8 @@ lzc_snapshot(nvlist_t *snaps, nvlist_t * * marked for deferred destruction, and will be destroyed when the last hold * or clone is removed/destroyed. * - * The return value will be ENOENT if none of the snapshots existed. - * * The return value will be 0 if all snapshots were destroyed (or marked for - * later destruction if 'defer' is set) or didn't exist to begin with and - * at least one snapshot was destroyed. + * later destruction if 'defer' is set) or didn't exist to begin with. * * Otherwise the return value will be the errno of a (unspecified) snapshot * that failed, no snapshots will be destroyed, and the errlist will have an @@ -397,15 +394,10 @@ lzc_exists(const char *dataset) * or imported. * * Holds for snapshots which don't exist will be skipped and have an entry - * added to errlist, but will not cause an overall failure, except in the - * case that all holds where skipped. - * - * The return value will be ENOENT if none of the snapshots for the requested - * holds existed. + * added to errlist, but will not cause an overall failure. * - * The return value will be 0 if the nvl holds was empty or all holds, for - * snapshots that existed, were succesfully created and at least one hold - * was created. + * The return value will be 0 if all holds, for snapshots that existed, + * were succesfully created. * * Otherwise the return value will be the errno of a (unspecified) hold that * failed and no holds will be created. @@ -449,13 +441,10 @@ lzc_hold(nvlist_t *holds, int cleanup_fd * The value is a nvlist whose keys are the holds to remove. * * Holds which failed to release because they didn't exist will have an entry - * added to errlist, but will not cause an overall failure, except in the - * case that all releases where skipped. - * - * The return value will be ENOENT if none of the specified holds existed. + * added to errlist, but will not cause an overall failure. * * The return value will be 0 if the nvl holds was empty or all holds that - * existed, were successfully removed and at least one hold was removed. + * existed, were successfully removed. * * Otherwise the return value will be the errno of a (unspecified) hold that * failed to release and no holds will be released. Modified: user/attilio/vmobj-readlock/contrib/gcc/config.gcc ============================================================================== --- user/attilio/vmobj-readlock/contrib/gcc/config.gcc Wed Jun 26 18:07:51 2013 (r252254) +++ user/attilio/vmobj-readlock/contrib/gcc/config.gcc Wed Jun 26 18:12:38 2013 (r252255) @@ -428,6 +428,10 @@ case ${target} in tm_defines="${tm_defines} FBSD_MAJOR=8" ;; *-*-freebsd9 | *-*-freebsd[9].*) tm_defines="${tm_defines} FBSD_MAJOR=9" ;; + *-*-freebsd10 | *-*-freebsd10.*) + tm_defines="${tm_defines} FBSD_MAJOR=10" ;; + *-*-freebsd11 | *-*-freebsd11.*) + tm_defines="${tm_defines} FBSD_MAJOR=11" ;; *) echo 'Please update *-*-freebsd* in gcc/config.gcc' exit 1 Modified: user/attilio/vmobj-readlock/contrib/gcc/gthr-posix95.h ============================================================================== --- user/attilio/vmobj-readlock/contrib/gcc/gthr-posix95.h Wed Jun 26 18:07:51 2013 (r252254) +++ user/attilio/vmobj-readlock/contrib/gcc/gthr-posix95.h Wed Jun 26 18:12:38 2013 (r252255) @@ -115,9 +115,15 @@ __gthrw(pthread_setschedparam) it is passed so we cannot pretend that the interface is active if -pthreads is not specified. On Solaris 2.5.1, the interface is not exposed at all so we need to play the usual game with weak symbols. On Solaris 10 and up, a - working interface is always exposed. */ + working interface is always exposed. On FreeBSD 6 and later, libc also + exposes a dummy POSIX threads interface, similar to what Solaris 2.6 up + to 9 does. FreeBSD >= 700014 even provides a pthread_cancel stub in libc, + which means the alternate __gthread_active_p below cannot be used there. */ -#if defined(__sun) && defined(__svr4__) + + */ + +#if defined(__FreeBSD__) || defined(__sun) && defined(__svr4__) static volatile int __gthread_active = -1; @@ -160,7 +166,7 @@ __gthread_active_p (void) return __gthread_active_latest_value != 0; } -#else /* not Solaris */ +#else /* neither FreeBSD nor Solaris */ static inline int __gthread_active_p (void) @@ -170,7 +176,7 @@ __gthread_active_p (void) return __gthread_active_ptr != 0; } -#endif /* Solaris */ +#endif /* FreeBSD or Solaris */ #else /* not SUPPORTS_WEAK */ Modified: user/attilio/vmobj-readlock/contrib/gcc/opts.c ============================================================================== --- user/attilio/vmobj-readlock/contrib/gcc/opts.c Wed Jun 26 18:07:51 2013 (r252254) +++ user/attilio/vmobj-readlock/contrib/gcc/opts.c Wed Jun 26 18:12:38 2013 (r252255) @@ -504,7 +504,7 @@ decode_options (unsigned int argc, const /* XXX: some issues with ports have been traced to -ftree-vrp. So remove it from -O2 and above. Note that jdk1{5,6} are affected and they build with w/-O3 - so we cannot just move it to -O3. */ - // flag_tree_vrp = 1; + /* flag_tree_vrp = 1; // See GCC tree-optimization/33099 */ if (!optimize_size) { Modified: user/attilio/vmobj-readlock/etc/devd/usb.conf ============================================================================== --- user/attilio/vmobj-readlock/etc/devd/usb.conf Wed Jun 26 18:07:51 2013 (r252254) +++ user/attilio/vmobj-readlock/etc/devd/usb.conf Wed Jun 26 18:12:38 2013 (r252255) @@ -4299,7 +4299,7 @@ nomatch 32 { match "bus" "uhub[0-9]+"; match "mode" "host"; match "vendor" "0x2001"; - match "product" "(0x3307|0x3308|0x3309|0x330a)"; + match "product" "(0x3307|0x3308|0x3309|0x330a|0x330d)"; action "kldload -n if_urtwn"; }; @@ -4976,5 +4976,5 @@ nomatch 32 { action "kldload -n umass"; }; -# 2479 USB entries processed +# 2480 USB entries processed Modified: user/attilio/vmobj-readlock/etc/network.subr ============================================================================== --- user/attilio/vmobj-readlock/etc/network.subr Wed Jun 26 18:07:51 2013 (r252254) +++ user/attilio/vmobj-readlock/etc/network.subr Wed Jun 26 18:12:38 2013 (r252255) @@ -171,6 +171,9 @@ ifconfig_up() if wpaif $1; then /etc/rc.d/wpa_supplicant start $1 _cfg=0 # XXX: not sure this should count + elif hostapif $1; then + /etc/rc.d/hostapd start $1 + _cfg=0 fi if dhcpif $1; then @@ -198,6 +201,9 @@ ifconfig_down() if wpaif $1; then /etc/rc.d/wpa_supplicant stop $1 _cfg=0 + elif hostapif $1; then + /etc/rc.d/hostapd stop $1 + _cfg=0 fi if dhcpif $1; then @@ -276,6 +282,7 @@ ifconfig_getargs() [Nn][Oo][Ss][Yy][Nn][Cc][Dd][Hh][Cc][Pp]) ;; [Ss][Yy][Nn][Cc][Dd][Hh][Cc][Pp]) ;; [Ww][Pp][Aa]) ;; + [Hh][Oo][Ss][Tt][Aa][Pp]) ;; *) _args="$_args $_arg" ;; @@ -376,6 +383,24 @@ wpaif() return 1 } +# hostapif if +# Returns 0 if the interface is a HOSTAP interface and 1 otherwise. +hostapif() +{ + local _tmpargs _arg + _tmpargs=`_ifconfig_getargs $1` + + for _arg in $_tmpargs; do + case $_arg in + [Hh][Oo][Ss][Tt][Aa][Pp]) + return 0 + ;; + esac + done + + return 1 +} + # afexists af # Returns 0 if the address family is enabled in the kernel # 1 otherwise. Modified: user/attilio/vmobj-readlock/etc/periodic/daily/450.status-security ============================================================================== --- user/attilio/vmobj-readlock/etc/periodic/daily/450.status-security Wed Jun 26 18:07:51 2013 (r252254) +++ user/attilio/vmobj-readlock/etc/periodic/daily/450.status-security Wed Jun 26 18:12:38 2013 (r252255) @@ -18,19 +18,19 @@ case "$daily_status_security_enable" in case "$daily_status_security_inline" in [Yy][Ee][Ss]) - export security_output="";; + daily_status_security_output="";; + esac + + export security_output="${daily_status_security_output}" + case "${daily_status_security_output}" in + "") + rc=3;; + /*) + echo " (output logged separately)" + rc=0;; *) - export security_output="${daily_status_security_output}" - case "${daily_status_security_output}" in - "") - rc=3;; - /*) - echo " (output logged separately)" - rc=0;; - *) - echo " (output mailed separately)" - rc=0;; - esac;; + echo " (output mailed separately)" + rc=0;; esac periodic security || rc=3;; Modified: user/attilio/vmobj-readlock/etc/rc.d/hostapd ============================================================================== --- user/attilio/vmobj-readlock/etc/rc.d/hostapd Wed Jun 26 18:07:51 2013 (r252254) +++ user/attilio/vmobj-readlock/etc/rc.d/hostapd Wed Jun 26 18:12:38 2013 (r252255) @@ -10,11 +10,18 @@ . /etc/rc.subr name="hostapd" -rcvar="hostapd_enable" command="/usr/sbin/${name}" -conf_file="/etc/${name}.conf" -pidfile="/var/run/${name}.pid" +ifn="$2" +if [ -z "$ifn" ]; then + rcvar="hostapd_enable" + conf_file="/etc/${name}.conf" + pidfile="/var/run/${name}.pid" +else + rcvar= + conf_file="/etc/${name}-${ifn}.conf" + pidfile="/var/run/${name}-${ifn}.pid" +fi command_args="-P ${pidfile} -B ${conf_file}" required_files="${conf_file}" Modified: user/attilio/vmobj-readlock/gnu/lib/libdialog/Makefile ============================================================================== --- user/attilio/vmobj-readlock/gnu/lib/libdialog/Makefile Wed Jun 26 18:07:51 2013 (r252254) +++ user/attilio/vmobj-readlock/gnu/lib/libdialog/Makefile Wed Jun 26 18:12:38 2013 (r252255) @@ -3,7 +3,7 @@ DIALOG= ${.CURDIR}/../../../contrib/dialog LIB= dialog -SHLIB_MAJOR= 7 +SHLIB_MAJOR= 8 SRCS= argv.c arrows.c buildlist.c buttons.c calendar.c checklist.c \ columns.c dlg_keys.c editbox.c fselect.c formbox.c guage.c \ help.c inputbox.c inputstr.c menubox.c mixedform.c \ Modified: user/attilio/vmobj-readlock/lib/msun/src/s_fma.c ============================================================================== --- user/attilio/vmobj-readlock/lib/msun/src/s_fma.c Wed Jun 26 18:07:51 2013 (r252254) +++ user/attilio/vmobj-readlock/lib/msun/src/s_fma.c Wed Jun 26 18:12:38 2013 (r252255) @@ -117,7 +117,7 @@ add_and_denormalize(double a, double b, if (sum.lo != 0) { EXTRACT_WORD64(hibits, sum.hi); bits_lost = -((int)(hibits >> 52) & 0x7ff) - scale + 1; - if (bits_lost != 1 ^ (int)(hibits & 1)) { + if ((bits_lost != 1) ^ (int)(hibits & 1)) { /* hibits += (int)copysign(1.0, sum.hi * sum.lo) */ EXTRACT_WORD64(lobits, sum.lo); hibits += 1 - (((hibits ^ lobits) >> 62) & 2); Modified: user/attilio/vmobj-readlock/lib/msun/src/s_fmal.c ============================================================================== --- user/attilio/vmobj-readlock/lib/msun/src/s_fmal.c Wed Jun 26 18:07:51 2013 (r252254) +++ user/attilio/vmobj-readlock/lib/msun/src/s_fmal.c Wed Jun 26 18:12:38 2013 (r252255) @@ -113,7 +113,7 @@ add_and_denormalize(long double a, long if (sum.lo != 0) { u.e = sum.hi; bits_lost = -u.bits.exp - scale + 1; - if (bits_lost != 1 ^ (int)(u.bits.manl & 1)) + if ((bits_lost != 1) ^ (int)(u.bits.manl & 1)) sum.hi = nextafterl(sum.hi, INFINITY * sum.lo); } return (ldexp(sum.hi, scale)); Modified: user/attilio/vmobj-readlock/release/doc/en_US.ISO8859-1/errata/article.xml ============================================================================== --- user/attilio/vmobj-readlock/release/doc/en_US.ISO8859-1/errata/article.xml Wed Jun 26 18:07:51 2013 (r252254) +++ user/attilio/vmobj-readlock/release/doc/en_US.ISO8859-1/errata/article.xml Wed Jun 26 18:12:38 2013 (r252255) @@ -28,7 +28,12 @@ <pubdate>$FreeBSD$</pubdate> <copyright> - <year>2013</year> + <year>2000</year> + <year>2001</year> + <year>2002</year> + <year>2003</year> + <year>2004</year> + <year>2005</year> <holder role="mailto:doc@FreeBSD.org">The &os; Documentation Project</holder> </copyright> @@ -51,8 +56,8 @@ should always be consulted before installing this version of &os;.</para> - <para>This errata document for &os; &release; will be maintained - until the release of &os; &release.current.release;.</para> + <para>This errata document for &os; &release; + will be maintained until the release of &os; &release.next;.</para> </abstract> <sect1 id="intro"> Modified: user/attilio/vmobj-readlock/release/doc/share/xml/release.ent ============================================================================== --- user/attilio/vmobj-readlock/release/doc/share/xml/release.ent Wed Jun 26 18:07:51 2013 (r252254) +++ user/attilio/vmobj-readlock/release/doc/share/xml/release.ent Wed Jun 26 18:12:38 2013 (r252255) @@ -6,9 +6,7 @@ <!-- Version of the OS we're describing. This needs to be updated with each new release. --> -<!ENTITY release.current.version "10.0"> -<!ENTITY release.current "&release.current.version;-CURRENT"> -<!ENTITY release.current.release "&release.current.version;-RELEASE"> +<!ENTITY release.current "10.0-CURRENT"> <!-- The previous version used for comparison in the "What's New" section. For -CURRENT, we might point back to the last Modified: user/attilio/vmobj-readlock/share/man/man4/Makefile ============================================================================== --- user/attilio/vmobj-readlock/share/man/man4/Makefile Wed Jun 26 18:07:51 2013 (r252254) +++ user/attilio/vmobj-readlock/share/man/man4/Makefile Wed Jun 26 18:12:38 2013 (r252255) @@ -371,6 +371,7 @@ MAN= aac.4 \ pts.4 \ pty.4 \ puc.4 \ + ${_qlxge.4} \ ${_qlxgb.4} \ ${_qlxgbe.4} \ ral.4 \ @@ -793,10 +794,12 @@ _bhyve.4= bhyve.4 _if_ntb.4= if_ntb.4 _ntb.4= ntb.4 _ntb_hw.4= ntb_hw.4 +_qlxge.4= qlxge.4 _qlxgb.4= qlxgb.4 _qlxgbe.4= qlxgbe.4 _sfxge.4= sfxge.4 +MLINKS+=qlxge.4 if_qlxge.4 MLINKS+=qlxgb.4 if_qlxgb.4 MLINKS+=qlxgbe.4 if_qlxgbe.4 MLINKS+=sfxge.4 if_sfxge.4 Modified: user/attilio/vmobj-readlock/share/man/man4/axe.4 ============================================================================== --- user/attilio/vmobj-readlock/share/man/man4/axe.4 Wed Jun 26 18:07:51 2013 (r252254) +++ user/attilio/vmobj-readlock/share/man/man4/axe.4 Wed Jun 26 18:12:38 2013 (r252255) @@ -30,7 +30,7 @@ .\" .\" $FreeBSD$ .\" -.Dd October 25, 2011 +.Dd June 25, 2013 .Dt AXE 4 .Os .Sh NAME @@ -215,6 +215,8 @@ AX88772B: .Bl -bullet -compact .It ASIX AX88772B +.It +Lenovo USB 2.0 Ethernet .El .Pp AX88760: Copied: user/attilio/vmobj-readlock/share/man/man4/qlxge.4 (from r252254, user/attilio/vmcontention/share/man/man4/qlxge.4) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/attilio/vmobj-readlock/share/man/man4/qlxge.4 Wed Jun 26 18:12:38 2013 (r252255, copy of r252254, user/attilio/vmcontention/share/man/man4/qlxge.4) @@ -0,0 +1,91 @@ +.\"- +.\" Copyright (c) 2013-2014 Qlogic Corporation +.\" All rights reserved. +.\" +.\" Redistribution and use in source and binary forms, with or without +.\" modification, are permitted provided that the following conditions +.\" are met: +.\" 1. Redistributions of source code must retain the above copyright +.\" notice, this list of conditions and the following disclaimer. +.\" 2. Redistributions in binary form must reproduce the above copyright +.\" notice, this list of conditions and the following disclaimer in the +.\" documentation and/or other materials provided with the distribution. +.\" +.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +.\" ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +.\" SUCH DAMAGE. +.\" +.\" $FreeBSD$ +.\" +.Dd June 21, 2013 +.Dt QLXGE 4 +.Os +.Sh NAME +.Nm qlxge +.Nd "QLogic 8100 Series 10 Gigabit Ethernet Adapter Driver" +.Sh SYNOPSIS +To compile this driver into the kernel, +place the following lines in your +kernel configuration file: +.Bd -ragged -offset indent +.Cd "device qlxge" +.Ed +.Pp +To load the driver as a +module at boot time, place the following line in +.Xr loader.conf 5 : +.Bd -literal -offset indent +if_qlxge_load="YES" +.Ed +.Sh DESCRIPTION +The +.Nm +driver supports IPv4 checksum offload, +TCP and UDP checksum offload for both IPv4 and IPv6, +Large Segment Offload for both IPv4 and IPv6, +Jumbo frames, VLAN Tag, and +Receive Side scaling. +For further hardware information, see +.Pa http://www.qlogic.com/ . +.Sh HARDWARE +The +.Nm +driver supports 10 Gigabit Ethernet & CNA Adapter based on the following +chipsets: +.Pp +.Bl -bullet -compact +.It +QLogic 8100 series +.El +.Sh SUPPORT +For support questions please contact your QLogic approved reseller or +QLogic Technical Support at +.Pa http://support.qlogic.com , +or by E-mail at +.Aq support@qlogic.com . +.Sh SEE ALSO +.Xr altq 4 , +.Xr arp 4 , +.Xr netintro 4 , +.Xr ng_ether 4 , +.Xr ifconfig 8 +.Sh HISTORY +The +.Nm +device driver first appeared in +.Fx 10.0 . +.Sh AUTHORS +.An -nosplit +The +.Nm +driver was written by +.An David C Somayajulu +at QLogic Corporation. Modified: user/attilio/vmobj-readlock/share/man/man4/urtwn.4 ============================================================================== --- user/attilio/vmobj-readlock/share/man/man4/urtwn.4 Wed Jun 26 18:07:51 2013 (r252254) +++ user/attilio/vmobj-readlock/share/man/man4/urtwn.4 Wed Jun 26 18:12:38 2013 (r252255) @@ -74,6 +74,7 @@ The following adapters should work: .Pp .Bl -tag -width Ds -offset indent -compact .It Belkin F7D1102 Surf Wireless Micro +.It D-Link DWA-131 .It Edimax EW-7811Un .It Netgear WNA1000M .It Realtek RTL8192CU Modified: user/attilio/vmobj-readlock/share/man/man5/rc.conf.5 ============================================================================== --- user/attilio/vmobj-readlock/share/man/man5/rc.conf.5 Wed Jun 26 18:07:51 2013 (r252254) +++ user/attilio/vmobj-readlock/share/man/man5/rc.conf.5 Wed Jun 26 18:12:38 2013 (r252255) @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd June 20, 2013 +.Dd June 25, 2013 .Dt RC.CONF 5 .Os .Sh NAME @@ -1321,7 +1321,7 @@ it is possible to use something like: ifconfig_ed0="DHCP" .Ed .Pp -Also, if you want to configure your wireless interface with +If you want to configure your wireless interface with .Xr wpa_supplicant 8 for use with WPA, EAP/LEAP or WEP, you need to add .Dq Li WPA @@ -1329,6 +1329,17 @@ to the .Va ifconfig_ Ns Aq Ar interface variable. .Pp +On the other hand, if you want to configure your wireless interface with +.Xr hostapd 8 , +you need to add +.Dq Li HOSTAP +to the +.Va ifconfig_ Ns Aq Ar interface +variable. +.Xr hostapd 8 +will use the settings from +.Pa /etc/hostapd- Ns Ao Ar interface Ac Ns .conf +.Pp Finally, you can add .Xr ifconfig 8 options in this variable, in addition to the Modified: user/attilio/vmobj-readlock/share/man/man9/Makefile ============================================================================== --- user/attilio/vmobj-readlock/share/man/man9/Makefile Wed Jun 26 18:07:51 2013 (r252254) +++ user/attilio/vmobj-readlock/share/man/man9/Makefile Wed Jun 26 18:12:38 2013 (r252255) @@ -1077,12 +1077,15 @@ MLINKS+=rman.9 rman_activate_resource.9 rman.9 rman_set_bustag.9 \ rman.9 rman_set_rid.9 \ rman.9 rman_set_virtual.9 -MLINKS+=rmlock.9 rm_destroy.9 \ +MLINKS+=rmlock.9 rm_assert.9 \ + rmlock.9 rm_destroy.9 \ rmlock.9 rm_init.9 \ + rmlock.9 rm_init_flags.9 \ rmlock.9 rm_rlock.9 \ - rmlock.9 rm_try_rlock.9 \ rmlock.9 rm_runlock.9 \ + rmlock.9 rm_sleep.9 \ rmlock.9 RM_SYSINIT.9 \ + rmlock.9 rm_try_rlock.9 \ rmlock.9 rm_wlock.9 \ rmlock.9 rm_wowned.9 \ rmlock.9 rm_wunlock.9 Modified: user/attilio/vmobj-readlock/share/man/man9/rmlock.9 ============================================================================== --- user/attilio/vmobj-readlock/share/man/man9/rmlock.9 Wed Jun 26 18:07:51 2013 (r252254) +++ user/attilio/vmobj-readlock/share/man/man9/rmlock.9 Wed Jun 26 18:12:38 2013 (r252255) @@ -26,7 +26,7 @@ .\" $FreeBSD$ .\" .\" Based on rwlock.9 man page -.Dd June 8, 2012 +.Dd June 25, 2013 .Dt RMLOCK 9 .Os .Sh NAME @@ -40,6 +40,8 @@ .Nm rm_runlock , .Nm rm_wunlock , .Nm rm_wowned , +.Nm rm_sleep , +.Nm rm_assert , .Nm RM_SYSINIT .Nd kernel reader/writer lock optimized for read-mostly access patterns .Sh SYNOPSIS @@ -64,6 +66,13 @@ .Fn rm_wunlock "struct rmlock *rm" .Ft int .Fn rm_wowned "const struct rmlock *rm" +.Ft int +.Fn rm_sleep "void *wchan" "struct rmlock *rm" "int priority" "const char *wmesg" "int timo" +.Pp +.Cd "options INVARIANTS" +.Cd "options INVARIANT_SUPPORT" +.Ft void +.Fn rm_assert "struct rmlock *rm" "int what" .In sys/kernel.h .Fn RM_SYSINIT "name" "struct rmlock *rm" "const char *desc" "int opts" .Sh DESCRIPTION @@ -215,12 +224,63 @@ lock must be unlocked. This function returns a non-zero value if the current thread owns an exclusive lock on .Fa rm . +.It Fn rm_sleep "void *wchan" "struct rmlock *rm" "int priority" "const char *wmesg" "int timo" +This function atomically releases +.Fa rm +while waiting for an event. +The +.Fa rm +lock must be exclusively locked. +For more details on the parameters to this function, +see +.Xr sleep 9 . +.It Fn rm_assert "struct rmlock *rm" "int what" +This function asserts that the +.Fa rm +lock is in the state specified by +.Fa what . +If the assertions are not true and the kernel is compiled with +.Cd "options INVARIANTS" +and +.Cd "options INVARIANT_SUPPORT" , +the kernel will panic. +Currently the following base assertions are supported: +.Bl -tag -width ".Dv RA_UNLOCKED" +.It Dv RA_LOCKED +Assert that current thread holds either a shared or exclusive lock +of +.Fa rm . +.It Dv RA_RLOCKED +Assert that current thread holds a shared lock of +.Fa rm . +.It Dv RA_WLOCKED +Assert that current thread holds an exclusive lock of +.Fa rm . +.It Dv RA_UNLOCKED +Assert that current thread holds neither a shared nor exclusive lock of +.Fa rm . +.El +.Pp +In addition, one of the following optional flags may be specified with +.Dv RA_LOCKED , +.Dv RA_RLOCKED , +or +.Dv RA_WLOCKED : +.Bl -tag -width ".Dv RA_NOTRECURSED" +.It Dv RA_RECURSED +Assert that the current thread holds a recursive lock of +.Fa rm . +.It Dv RA_NOTRECURSED +Assert that the current thread does not hold a recursive lock of +.Fa rm . +.El .El .Sh SEE ALSO .Xr locking 9 , .Xr mutex 9 , .Xr panic 9 , .Xr rwlock 9 , +.Xr sleep 9 , .Xr sema 9 , .Xr sx 9 .Sh HISTORY @@ -252,8 +312,3 @@ implementation uses a single per CPU lis rmlocks in the system. If rmlocks become popular, hashing to multiple per CPU queues may be needed to speed up the writer lock process. -.Pp -The -.Nm -can currently not be used as a lock argument for condition variable -wait functions. Modified: user/attilio/vmobj-readlock/share/misc/committers-ports.dot ============================================================================== --- user/attilio/vmobj-readlock/share/misc/committers-ports.dot Wed Jun 26 18:07:51 2013 (r252254) +++ user/attilio/vmobj-readlock/share/misc/committers-ports.dot Wed Jun 26 18:12:38 2013 (r252255) @@ -90,6 +90,7 @@ ehaupt [label="Emanuel Haupt\nehaupt@Fre eik [label="Oliver Eikemeier\neik@FreeBSD.org\n2003/11/12"] erwin [label="Erwin Lansing\nerwin@FreeBSD.org\n2003/06/04"] farrokhi [label="Babak Farrokhi\nfarrokhi@FreeBSD.org\n2006/11/07"] +feld [label="Mark Felder\nfeld@FreeBSD.org\n2013/06/25"] fjoe [label="Max Khon\nfjoe@FreeBSD.org\n2001/08/06"] flo [label="Florian Smeets\nflo@FreeBSD.org\n2010/12/07"] fluffy [label="Dima Panov\nfluffy@FreeBSD.org\n2009/08/10"] @@ -266,6 +267,7 @@ clement -> lawrance clsung -> lwhsu clsung -> tabthorpe +crees -> feld crees -> gjb crees -> jgh crees -> madpilot @@ -492,6 +494,7 @@ stas -> araujo steve -> netchild +swills -> feld swills -> pclin tabthorpe -> ashish Modified: user/attilio/vmobj-readlock/sys/arm/ti/ti_scm.c ============================================================================== --- user/attilio/vmobj-readlock/sys/arm/ti/ti_scm.c Wed Jun 26 18:07:51 2013 (r252254) +++ user/attilio/vmobj-readlock/sys/arm/ti/ti_scm.c Wed Jun 26 18:12:38 2013 (r252255) @@ -163,7 +163,9 @@ ti_scm_padconf_set_internal(struct ti_sc /* set the mux mode */ reg_val |= (uint16_t)(mode & ti_scm_dev.padconf_muxmode_mask); - printf("setting internal %x for %s\n", reg_val, muxmode); + if (bootverbose) + device_printf(sc->sc_dev, "setting internal %x for %s\n", + reg_val, muxmode); /* write the register value (16-bit writes) */ ti_scm_write_2(sc, padconf->reg_off, reg_val); Modified: user/attilio/vmobj-readlock/sys/cam/scsi/scsi_all.c ============================================================================== --- user/attilio/vmobj-readlock/sys/cam/scsi/scsi_all.c Wed Jun 26 18:07:51 2013 (r252254) +++ user/attilio/vmobj-readlock/sys/cam/scsi/scsi_all.c Wed Jun 26 18:12:38 2013 (r252255) @@ -737,6 +737,172 @@ static struct asc_table_entry sony_mo_en "Logical unit not ready, cause not reportable") } }; +static struct asc_table_entry hgst_entries[] = { + { SST(0x04, 0xF0, SS_RDEF, + "Vendor Unique - Logical Unit Not Ready") }, + { SST(0x0A, 0x01, SS_RDEF, + "Unrecovered Super Certification Log Write Error") }, + { SST(0x0A, 0x02, SS_RDEF, + "Unrecovered Super Certification Log Read Error") }, + { SST(0x15, 0x03, SS_RDEF, + "Unrecovered Sector Error") }, + { SST(0x3E, 0x04, SS_RDEF, + "Unrecovered Self-Test Hard-Cache Test Fail") }, + { SST(0x3E, 0x05, SS_RDEF, + "Unrecovered Self-Test OTF-Cache Fail") }, + { SST(0x40, 0x00, SS_RDEF, + "Unrecovered SAT No Buffer Overflow Error") }, + { SST(0x40, 0x01, SS_RDEF, + "Unrecovered SAT Buffer Overflow Error") }, + { SST(0x40, 0x02, SS_RDEF, + "Unrecovered SAT No Buffer Overflow With ECS Fault") }, + { SST(0x40, 0x03, SS_RDEF, + "Unrecovered SAT Buffer Overflow With ECS Fault") }, + { SST(0x40, 0x81, SS_RDEF, + "DRAM Failure") }, + { SST(0x44, 0x0B, SS_RDEF, + "Vendor Unique - Internal Target Failure") }, + { SST(0x44, 0xF2, SS_RDEF, + "Vendor Unique - Internal Target Failure") }, + { SST(0x44, 0xF6, SS_RDEF, + "Vendor Unique - Internal Target Failure") }, + { SST(0x44, 0xF9, SS_RDEF, + "Vendor Unique - Internal Target Failure") }, + { SST(0x44, 0xFA, SS_RDEF, + "Vendor Unique - Internal Target Failure") }, + { SST(0x5D, 0x22, SS_RDEF, + "Extreme Over-Temperature Warning") }, + { SST(0x5D, 0x50, SS_RDEF, + "Load/Unload cycle Count Warning") }, + { SST(0x81, 0x00, SS_RDEF, + "Vendor Unique - Internal Logic Error") }, + { SST(0x85, 0x00, SS_RDEF, + "Vendor Unique - Internal Key Seed Error") }, +}; + +static struct asc_table_entry seagate_entries[] = { + { SST(0x04, 0xF0, SS_RDEF, + "Logical Unit Not Ready, super certify in Progress") }, + { SST(0x08, 0x86, SS_RDEF, + "Write Fault Data Corruption") }, + { SST(0x09, 0x0D, SS_RDEF, + "Tracking Failure") }, + { SST(0x09, 0x0E, SS_RDEF, + "ETF Failure") }, + { SST(0x0B, 0x5D, SS_RDEF, + "Pre-SMART Warning") }, + { SST(0x0B, 0x85, SS_RDEF, + "5V Voltage Warning") }, + { SST(0x0B, 0x8C, SS_RDEF, + "12V Voltage Warning") }, + { SST(0x0C, 0xFF, SS_RDEF, + "Write Error - Too many error recovery revs") }, + { SST(0x11, 0xFF, SS_RDEF, + "Unrecovered Read Error - Too many error recovery revs") }, + { SST(0x19, 0x0E, SS_RDEF, + "Fewer than 1/2 defect list copies") }, + { SST(0x20, 0xF3, SS_RDEF, + "Illegal CDB linked to skip mask cmd") }, + { SST(0x24, 0xF0, SS_RDEF, + "Illegal byte in CDB, LBA not matching") }, + { SST(0x24, 0xF1, SS_RDEF, + "Illegal byte in CDB, LEN not matching") }, + { SST(0x24, 0xF2, SS_RDEF, + "Mask not matching transfer length") }, + { SST(0x24, 0xF3, SS_RDEF, + "Drive formatted without plist") }, + { SST(0x26, 0x95, SS_RDEF, + "Invalid Field Parameter - CAP File") }, + { SST(0x26, 0x96, SS_RDEF, + "Invalid Field Parameter - RAP File") }, + { SST(0x26, 0x97, SS_RDEF, + "Invalid Field Parameter - TMS Firmware Tag") }, + { SST(0x26, 0x98, SS_RDEF, + "Invalid Field Parameter - Check Sum") }, + { SST(0x26, 0x99, SS_RDEF, + "Invalid Field Parameter - Firmware Tag") }, + { SST(0x29, 0x08, SS_RDEF, + "Write Log Dump data") }, + { SST(0x29, 0x09, SS_RDEF, + "Write Log Dump data") }, + { SST(0x29, 0x0A, SS_RDEF, + "Reserved disk space") }, + { SST(0x29, 0x0B, SS_RDEF, + "SDBP") }, + { SST(0x29, 0x0C, SS_RDEF, + "SDBP") }, + { SST(0x31, 0x91, SS_RDEF, + "Format Corrupted World Wide Name (WWN) is Invalid") }, + { SST(0x32, 0x03, SS_RDEF, + "Defect List - Length exceeds Command Allocated Length") }, + { SST(0x33, 0x00, SS_RDEF, + "Flash not ready for access") }, + { SST(0x3F, 0x70, SS_RDEF, + "Invalid RAP block") }, + { SST(0x3F, 0x71, SS_RDEF, + "RAP/ETF mismatch") }, + { SST(0x3F, 0x90, SS_RDEF, + "Invalid CAP block") }, + { SST(0x3F, 0x91, SS_RDEF, + "World Wide Name (WWN) Mismatch") }, + { SST(0x40, 0x01, SS_RDEF, + "DRAM Parity Error") }, + { SST(0x40, 0x02, SS_RDEF, + "DRAM Parity Error") }, + { SST(0x42, 0x0A, SS_RDEF, + "Loopback Test") }, + { SST(0x42, 0x0B, SS_RDEF, + "Loopback Test") }, + { SST(0x44, 0xF2, SS_RDEF, + "Compare error during data integrity check") }, + { SST(0x44, 0xF6, SS_RDEF, + "Unrecoverable error during data integrity check") }, + { SST(0x47, 0x80, SS_RDEF, + "Fibre Channel Sequence Error") }, + { SST(0x4E, 0x01, SS_RDEF, + "Information Unit Too Short") }, + { SST(0x80, 0x00, SS_RDEF, + "General Firmware Error / Command Timeout") }, + { SST(0x80, 0x01, SS_RDEF, + "Command Timeout") }, + { SST(0x80, 0x02, SS_RDEF, + "Command Timeout") }, + { SST(0x80, 0x80, SS_RDEF, + "FC FIFO Error During Read Transfer") }, + { SST(0x80, 0x81, SS_RDEF, + "FC FIFO Error During Write Transfer") }, + { SST(0x80, 0x82, SS_RDEF, + "DISC FIFO Error During Read Transfer") }, + { SST(0x80, 0x83, SS_RDEF, + "DISC FIFO Error During Write Transfer") }, + { SST(0x80, 0x84, SS_RDEF, + "LBA Seeded LRC Error on Read") }, + { SST(0x80, 0x85, SS_RDEF, + "LBA Seeded LRC Error on Write") }, + { SST(0x80, 0x86, SS_RDEF, + "IOEDC Error on Read") }, + { SST(0x80, 0x87, SS_RDEF, + "IOEDC Error on Write") }, + { SST(0x80, 0x88, SS_RDEF, + "Host Parity Check Failed") }, + { SST(0x80, 0x89, SS_RDEF, + "IOEDC error on read detected by formatter") }, + { SST(0x80, 0x8A, SS_RDEF, + "Host Parity Errors / Host FIFO Initialization Failed") }, + { SST(0x80, 0x8B, SS_RDEF, + "Host Parity Errors") }, + { SST(0x80, 0x8C, SS_RDEF, + "Host Parity Errors") }, + { SST(0x80, 0x8D, SS_RDEF, + "Host Parity Errors") }, + { SST(0x81, 0x00, SS_RDEF, + "LA Check Failed") }, + { SST(0x82, 0x00, SS_RDEF, + "Internal client detected insufficient buffer") }, + { SST(0x84, 0x00, SS_RDEF, + "Scheduled Diagnostic And Repair") }, +}; + static struct scsi_sense_quirk_entry sense_quirk_table[] = { { /* @@ -759,6 +925,26 @@ static struct scsi_sense_quirk_entry sen sizeof(sony_mo_entries)/sizeof(struct asc_table_entry), /*sense key entries*/NULL, sony_mo_entries + }, + { + /* + * HGST vendor-specific error codes + */ + {T_DIRECT, SIP_MEDIA_FIXED, "HGST", "*", "*"}, + /*num_sense_keys*/0, + sizeof(hgst_entries)/sizeof(struct asc_table_entry), + /*sense key entries*/NULL, + hgst_entries + }, + { + /* + * SEAGATE vendor-specific error codes + */ + {T_DIRECT, SIP_MEDIA_FIXED, "SEAGATE", "*", "*"}, + /*num_sense_keys*/0, + sizeof(seagate_entries)/sizeof(struct asc_table_entry), + /*sense key entries*/NULL, + seagate_entries } }; Modified: user/attilio/vmobj-readlock/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_destroy.c ============================================================================== --- user/attilio/vmobj-readlock/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_destroy.c Wed Jun 26 18:07:51 2013 (r252254) +++ user/attilio/vmobj-readlock/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_destroy.c Wed Jun 26 18:12:38 2013 (r252255) @@ -129,9 +129,6 @@ dsl_destroy_snapshot_check(void *arg, dm if (pair != NULL) return (fnvpair_value_int32(pair)); - if (nvlist_empty(dsda->dsda_successful_snaps)) - return (SET_ERROR(ENOENT)); - return (0); } Modified: user/attilio/vmobj-readlock/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_userhold.c ============================================================================== --- user/attilio/vmobj-readlock/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_userhold.c Wed Jun 26 18:07:51 2013 (r252254) +++ user/attilio/vmobj-readlock/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_userhold.c Wed Jun 26 18:12:38 2013 (r252255) @@ -126,10 +126,6 @@ dsl_dataset_user_hold_check(void *arg, d } } - /* Return ENOENT if no holds would be created. */ - if (nvlist_empty(dduha->dduha_chkholds)) - return (SET_ERROR(ENOENT)); - return (0); } @@ -468,10 +464,6 @@ dsl_dataset_user_release_check(void *arg } } - /* Return ENOENT if none of the holds existed. */ - if (nvlist_empty(ddura->ddura_chkholds)) - return (SET_ERROR(ENOENT)); - return (0); } Modified: user/attilio/vmobj-readlock/sys/conf/files.amd64 ============================================================================== --- user/attilio/vmobj-readlock/sys/conf/files.amd64 Wed Jun 26 18:07:51 2013 (r252254) *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***help
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201306261812.r5QICcx5014852>