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

Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch

This commit is contained in:
Brian Behlendorf 2008-12-05 12:38:17 -08:00
parent 1753e62039 a363cdfb2d
commit 57d540b05d
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
zfs/lib/libzpool/zfs_fm.c
View File

@ -92,7 +92,7 @@ void
zfs_ereport_post(const char *subclass, spa_t *spa, vdev_t *vd, zio_t *zio,
uint64_t stateoroffset, uint64_t size)
{
#ifdef _KERNEL
#if defined(_KERNEL) && defined(HAVE_FM)
nvlist_t *ereport, *detector;
uint64_t ena;
char class[64];
@ -315,7 +315,7 @@ zfs_ereport_post(const char *subclass, spa_t *spa, vdev_t *vd, zio_t *zio,
static void
zfs_post_common(spa_t *spa, vdev_t *vd, const char *name)
{
#ifdef _KERNEL
#if defined(_KERNEL) && defined(HAVE_FM)
nvlist_t *resource;
char class[64];