diff options
| author | Brian Behlendorf <[email protected]> | 2009-08-18 11:43:27 -0700 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2009-08-18 11:43:27 -0700 |
| commit | 45d1cae3b8c949ecc391dd7a5b81963b34c71c29 (patch) | |
| tree | 69b1f860eb1f9b1ebdef392760814c5cc089f345 /module/zfs/spa_misc.c | |
| parent | 9babb37438b58e77bad04e820d5702e15b79e6a6 (diff) | |
Rebase master to b121
Diffstat (limited to 'module/zfs/spa_misc.c')
| -rw-r--r-- | module/zfs/spa_misc.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/module/zfs/spa_misc.c b/module/zfs/spa_misc.c index aea3f5625..8150ac937 100644 --- a/module/zfs/spa_misc.c +++ b/module/zfs/spa_misc.c @@ -310,8 +310,12 @@ spa_config_tryenter(spa_t *spa, int locks, void *tag, krw_t rw) void spa_config_enter(spa_t *spa, int locks, void *tag, krw_t rw) { + int wlocks_held = 0; + for (int i = 0; i < SCL_LOCKS; i++) { spa_config_lock_t *scl = &spa->spa_config_lock[i]; + if (scl->scl_writer == curthread) + wlocks_held |= (1 << i); if (!(locks & (1 << i))) continue; mutex_enter(&scl->scl_lock); @@ -331,6 +335,7 @@ spa_config_enter(spa_t *spa, int locks, void *tag, krw_t rw) (void) refcount_add(&scl->scl_count, tag); mutex_exit(&scl->scl_lock); } + ASSERT(wlocks_held <= locks); } void |