c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2025-04-06 17:49:11 +03:00
Code Issues Packages Projects Releases Wiki Activity

Condition variable usage, zevent_cv

Browse Source 
The following incorrect usage of cv_broadcast() was caught by
code inspection.  The cv_broadcast() function must be called
under the associated mutex to preventing racing with cv_wait().

Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
This commit is contained in:
Brian Behlendorf 2012-10-15 13:36:26 -07:00
parent 6cb7ab069d
commit 99db9bfde7
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
module/zfs/fm.c
View File

@ -481,14 +481,13 @@ zfs_zevent_drain_all(int *count)
static void static void
zfs_zevent_insert(zevent_t *ev) zfs_zevent_insert(zevent_t *ev)
{ {
mutex_enter(&zevent_lock); ASSERT(MUTEX_HELD(&zevent_lock));
list_insert_head(&zevent_list, ev); list_insert_head(&zevent_list, ev);
if (zevent_len_cur >= zfs_zevent_len_max) if (zevent_len_cur >= zfs_zevent_len_max)
zfs_zevent_drain(list_tail(&zevent_list)); zfs_zevent_drain(list_tail(&zevent_list));
else else
zevent_len_cur++; zevent_len_cur++;
mutex_exit(&zevent_lock);
} }
/* /*
@ -528,8 +527,11 @@ zfs_zevent_post(nvlist_t *nvl, nvlist_t *detector, zevent_cb_t *cb)
ev->ev_nvl = nvl; ev->ev_nvl = nvl;
ev->ev_detector = detector; ev->ev_detector = detector;
ev->ev_cb = cb; ev->ev_cb = cb;
mutex_enter(&zevent_lock);
zfs_zevent_insert(ev); zfs_zevent_insert(ev);
cv_broadcast(&zevent_cv); cv_broadcast(&zevent_cv);
mutex_exit(&zevent_lock);
} }
static int static int
@ -1520,9 +1522,10 @@ fm_fini(void)
int count; int count;
zfs_zevent_drain_all(&count); zfs_zevent_drain_all(&count);
cv_broadcast(&zevent_cv);
mutex_enter(&zevent_lock); mutex_enter(&zevent_lock);
cv_broadcast(&zevent_cv);
zevent_flags |= ZEVENT_SHUTDOWN; zevent_flags |= ZEVENT_SHUTDOWN;
while (zevent_waiters > 0) { while (zevent_waiters > 0) {
mutex_exit(&zevent_lock); mutex_exit(&zevent_lock);