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

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

This commit is contained in:
Brian Behlendorf 2010-04-29 13:08:10 -07:00
parent bfd847de96 44ce1eb434
commit ab2e9b8b7f
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
module/zfs/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)
{
#if defined(_KERNEL) && defined(HAVE_FM)
#ifdef _KERNEL
nvlist_t *ereport, *detector;
uint64_t ena;
char class[64];
@ -334,7 +334,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)
{
#if defined(_KERNEL) && defined(HAVE_FM)
#ifdef _KERNEL
nvlist_t *resource;
char class[64];