From owner-svn-src-projects@FreeBSD.ORG Mon Jul 18 20:06:49 2011 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C7D22106564A; Mon, 18 Jul 2011 20:06:49 +0000 (UTC) (envelope-from gibbs@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 9E24E8FC13; Mon, 18 Jul 2011 20:06:49 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p6IK6nnk037463; Mon, 18 Jul 2011 20:06:49 GMT (envelope-from gibbs@svn.freebsd.org) Received: (from gibbs@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p6IK6nHQ037460; Mon, 18 Jul 2011 20:06:49 GMT (envelope-from gibbs@svn.freebsd.org) Message-Id: <201107182006.p6IK6nHQ037460@svn.freebsd.org> From: "Justin T. Gibbs" Date: Mon, 18 Jul 2011 20:06:49 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r224200 - in projects/zfsd/head/sys/cddl/contrib/opensolaris/uts/common: fs/zfs sys/sysevent X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 Jul 2011 20:06:49 -0000 Author: gibbs Date: Mon Jul 18 20:06:49 2011 New Revision: 224200 URL: http://svn.freebsd.org/changeset/base/224200 Log: sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c: sys/cddl/contrib/opensolaris/uts/common/sys/sysevent/dev.h: Emit "dev_path" instead of "phys_path" in autoexpand events. The "dev_path" already is a devfs path to the device and this avoids having to convert the physical path information into a devfs path in yet another location. Sponsored by: Spectra Logic Corporation Modified: projects/zfsd/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c projects/zfsd/head/sys/cddl/contrib/opensolaris/uts/common/sys/sysevent/dev.h Modified: projects/zfsd/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c ============================================================================== --- projects/zfsd/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c Mon Jul 18 20:06:15 2011 (r224199) +++ projects/zfsd/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c Mon Jul 18 20:06:49 2011 (r224200) @@ -5051,7 +5051,6 @@ spa_async_autoexpand(spa_t *spa, vdev_t { sysevent_id_t eid; nvlist_t *attr; - char *physpath; if (!spa->spa_autoexpand) return; @@ -5061,20 +5060,16 @@ spa_async_autoexpand(spa_t *spa, vdev_t spa_async_autoexpand(spa, cvd); } - if (!vd->vdev_ops->vdev_op_leaf || vd->vdev_physpath == NULL) + if (!vd->vdev_ops->vdev_op_leaf || vd->vdev_path == NULL) return; - physpath = kmem_zalloc(MAXPATHLEN, KM_SLEEP); - (void) snprintf(physpath, MAXPATHLEN, "/devices%s", vd->vdev_physpath); - VERIFY(nvlist_alloc(&attr, NV_UNIQUE_NAME, KM_SLEEP) == 0); - VERIFY(nvlist_add_string(attr, DEV_PHYS_PATH, physpath) == 0); + VERIFY(nvlist_add_string(attr, DEV_PATH, vd->vdev_path) == 0); (void) ddi_log_sysevent(zfs_dip, SUNW_VENDOR, EC_DEV_STATUS, ESC_ZFS_VDEV_AUTOEXPAND, attr, &eid, DDI_SLEEP); nvlist_free(attr); - kmem_free(physpath, MAXPATHLEN); } static void Modified: projects/zfsd/head/sys/cddl/contrib/opensolaris/uts/common/sys/sysevent/dev.h ============================================================================== --- projects/zfsd/head/sys/cddl/contrib/opensolaris/uts/common/sys/sysevent/dev.h Mon Jul 18 20:06:15 2011 (r224199) +++ projects/zfsd/head/sys/cddl/contrib/opensolaris/uts/common/sys/sysevent/dev.h Mon Jul 18 20:06:49 2011 (r224200) @@ -236,6 +236,7 @@ extern "C" { #define EV_VERSION "version" #define DEV_PHYS_PATH "phys_path" +#define DEV_PATH "dev_path" #define DEV_NAME "dev_name" #define DEV_DRIVER_NAME "driver_name" #define DEV_INSTANCE "instance"