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

Merge commit 'refs/remotes/origin/linux-have-fm' into HEAD

This commit is contained in:
Brian Behlendorf 2009-06-26 14:34:08 -07:00
parent 4fbded409d 5956cd1a7b
commit 500148acb5
3 changed files with 5 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.topdeps
View File

@ -1,3 +1 @@
gcc-branch zfs-branch
fix-branch
feature-branch

17
.topmsg
View File

@ -1,19 +1,6 @@
From: Brian Behlendorf <behlendorf1@llnl.gov> From: Brian Behlendorf <behlendorf1@llnl.gov>
Subject: [PATCH] zfs branch Subject: [PATCH] linux have fm
Merged result of all changes which are relevant to both Solaris Use fm_* if HAVE_FM defined
and Linux builds of the ZFS code. These are changes where there
is a reasonable chance they will be accepted upstream.
Additionally, since this is effectively the root of the linux
ZFS tree the core linux build system is added here. This
includes autogen.sh, configure.ac, m4 macros, some scripts/*,
and makefiles for all the core ZFS components. Linux-only
features which require tweaks to the build system should appear
on the relevant topic branches. All autotools products which
result from autogen.sh are commited to the linux-configure-branch.
This branch also contains the META, ChangeLog, AUTHORS, TODO,
and README, files.
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov> Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>

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