diff options
| author | Brian Behlendorf <[email protected]> | 2010-05-28 13:45:14 -0700 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2010-05-28 13:45:14 -0700 |
| commit | 428870ff734fdaccc342b33fc53cf94724409a46 (patch) | |
| tree | 164e83c0ceda52a843795ed7cd9e95637d02c177 /module/zfs/space_map.c | |
| parent | 6119cb885a976e175a6e827894accf657ff1984f (diff) | |
Update core ZFS code from build 121 to build 141.
Diffstat (limited to 'module/zfs/space_map.c')
| -rw-r--r-- | module/zfs/space_map.c | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/module/zfs/space_map.c b/module/zfs/space_map.c index 75b55d5c1..1ce7b2a3d 100644 --- a/module/zfs/space_map.c +++ b/module/zfs/space_map.c @@ -258,8 +258,10 @@ space_map_load_wait(space_map_t *sm) { ASSERT(MUTEX_HELD(sm->sm_lock)); - while (sm->sm_loading) + while (sm->sm_loading) { + ASSERT(!sm->sm_loaded); cv_wait(&sm->sm_load_cv, sm->sm_lock); + } } /* @@ -276,11 +278,8 @@ space_map_load(space_map_t *sm, space_map_ops_t *ops, uint8_t maptype, int error = 0; ASSERT(MUTEX_HELD(sm->sm_lock)); - - space_map_load_wait(sm); - - if (sm->sm_loaded) - return (0); + ASSERT(!sm->sm_loaded); + ASSERT(!sm->sm_loading); sm->sm_loading = B_TRUE; end = smo->smo_objsize; @@ -368,10 +367,8 @@ space_map_unload(space_map_t *sm) uint64_t space_map_maxsize(space_map_t *sm) { - if (sm->sm_loaded && sm->sm_ops != NULL) - return (sm->sm_ops->smop_max(sm)); - else - return (-1ULL); + ASSERT(sm->sm_ops != NULL); + return (sm->sm_ops->smop_max(sm)); } uint64_t |