diff options
| author | Jeff Bonwick <Jeff.Bonwick@Sun.COM> | 2009-11-19 22:24:55 -0800 |
|---|---|---|
| committer | Jeff Bonwick <Jeff.Bonwick@Sun.COM> | 2009-11-19 22:24:55 -0800 |
| commit | bbfd46c40e81c7d954cec28db66453ec5ab44613 (patch) | |
| tree | 86844cfe509130c1a9b2502fac9b063cf6242a9b /usr/src/uts/common/fs/zfs/spa_misc.c | |
| parent | 68e92846614d4b32eb1a814a5e8e77331cfaaa59 (diff) | |
| download | illumos-joyent-bbfd46c40e81c7d954cec28db66453ec5ab44613.tar.gz | |
6899923 vdev_offline/vdev_add deadlock
6900497 zdb -S could be much faster
6900898 deduped blocks should be scrubbed/resilvered exactly once
Diffstat (limited to 'usr/src/uts/common/fs/zfs/spa_misc.c')
| -rw-r--r-- | usr/src/uts/common/fs/zfs/spa_misc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr/src/uts/common/fs/zfs/spa_misc.c b/usr/src/uts/common/fs/zfs/spa_misc.c index 59e5ca04c4..02d6ff35c4 100644 --- a/usr/src/uts/common/fs/zfs/spa_misc.c +++ b/usr/src/uts/common/fs/zfs/spa_misc.c @@ -840,8 +840,8 @@ spa_l2cache_activate(vdev_t *vd) uint64_t spa_vdev_enter(spa_t *spa) { - mutex_enter(&spa_namespace_lock); mutex_enter(&spa->spa_vdev_top_lock); + mutex_enter(&spa_namespace_lock); return (spa_vdev_config_enter(spa)); } @@ -937,8 +937,8 @@ int spa_vdev_exit(spa_t *spa, vdev_t *vd, uint64_t txg, int error) { spa_vdev_config_exit(spa, vd, txg, error, FTAG); - mutex_exit(&spa->spa_vdev_top_lock); mutex_exit(&spa_namespace_lock); + mutex_exit(&spa->spa_vdev_top_lock); return (error); } |