Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
This commit is contained in:
commit
98ec924a89
|
@ -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];
|
||||
|
||||
|
|
Loading…
Reference in New Issue