Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch

This commit is contained in:
Brian Behlendorf 2009-07-07 17:13:35 -07:00
parent 7bd98c8239 756d013735
commit 28718acdab
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
module/zfs/spa.c
View File

@ -3716,9 +3716,11 @@ spa_async_probe(spa_t *spa, vdev_t *vd)
static void static void
spa_async_autoexpand(spa_t *spa, vdev_t *vd) spa_async_autoexpand(spa_t *spa, vdev_t *vd)
{ {
#ifdef HAVE_SYSEVENT
sysevent_id_t eid; sysevent_id_t eid;
nvlist_t *attr; nvlist_t *attr;
char *physpath; char *physpath;
#endif
int c; int c;
if (!spa->spa_autoexpand) if (!spa->spa_autoexpand)
@ -3732,6 +3734,7 @@ spa_async_autoexpand(spa_t *spa, vdev_t *vd)
if (!vd->vdev_ops->vdev_op_leaf || vd->vdev_physpath == NULL) if (!vd->vdev_ops->vdev_op_leaf || vd->vdev_physpath == NULL)
return; return;
#ifdef HAVE_SYSEVENT
physpath = kmem_zalloc(MAXPATHLEN, KM_SLEEP); physpath = kmem_zalloc(MAXPATHLEN, KM_SLEEP);
(void) snprintf(physpath, MAXPATHLEN, "/devices%s", vd->vdev_physpath); (void) snprintf(physpath, MAXPATHLEN, "/devices%s", vd->vdev_physpath);
@ -3743,6 +3746,7 @@ spa_async_autoexpand(spa_t *spa, vdev_t *vd)
nvlist_free(attr); nvlist_free(attr);
kmem_free(physpath, MAXPATHLEN); kmem_free(physpath, MAXPATHLEN);
#endif
} }
static void static void