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

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

Conflicts:
	module/zfs/include/sys/zfs_context.h
This commit is contained in:
Brian Behlendorf 2010-05-28 22:22:13 -07:00
parent b13a072a2c 7008960b9e
commit 63532dab9f
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
module/zfs/fm.c
View File

@ -494,7 +494,7 @@ fm_zevent_insert(zevent_t *ev)
* Post a zevent * Post a zevent
*/ */
void void
fm_zevent_post(nvlist_t *nvl, zevent_cb_t *cb) fm_zevent_post(nvlist_t *nvl, nvlist_t *detector, zevent_cb_t *cb)
{ {
size_t nvl_size = 0; size_t nvl_size = 0;
zevent_t *ev; zevent_t *ev;
@ -515,6 +515,7 @@ fm_zevent_post(nvlist_t *nvl, zevent_cb_t *cb)
} }
ev->ev_nvl = nvl; ev->ev_nvl = nvl;
ev->ev_detector = detector;
ev->ev_cb = cb; ev->ev_cb = cb;
fm_zevent_insert(ev); fm_zevent_insert(ev);
cv_broadcast(&zevent_cv); cv_broadcast(&zevent_cv);

9
module/zfs/include/sys/fm/util.h
View File

@ -82,10 +82,11 @@ typedef struct erpt_dump {
typedef void zevent_cb_t(nvlist_t *); typedef void zevent_cb_t(nvlist_t *);
typedef struct zevent_s { typedef struct zevent_s {
nvlist_t *ev_nvl; /* protected by the zevent_lock */ nvlist_t *ev_nvl; /* protected by the zevent_lock */
list_t ev_zpd_list; /* " */ nvlist_t *ev_detector; /* " */
list_node_t ev_node; /* " */ list_t ev_zpd_list; /* " */
zevent_cb_t *ev_cb; /* " */ list_node_t ev_node; /* " */
zevent_cb_t *ev_cb; /* " */
} zevent_t; } zevent_t;
typedef struct zfs_private_data { typedef struct zfs_private_data {

4
module/zfs/include/sys/zfs_context.h
View File

@ -59,6 +59,10 @@ extern "C" {
#include <sys/uio.h> #include <sys/uio.h>
#include <sys/zfs_debug.h> #include <sys/zfs_debug.h>
#include <sys/fm/fs/zfs.h> #include <sys/fm/fs/zfs.h>
#include <sys/fm/util.h>
#include <sys/sunddi.h>
#define CPU_SEQID (CPU->cpu_seqid)
#ifdef __cplusplus #ifdef __cplusplus
} }