Illumos 5269 - zpool import slow

[mirror_zfs.git] / module / zfs / spa.c

diff --git a/module/zfs/spa.c b/module/zfs/spa.c
index 2a9ef9ce53e429845d5f98e9b619c19e1bd4e168..c37feb733413412de213c2122b9b4a0f2a35aec5 100644 (file)
--- a/module/zfs/spa.c
+++ b/module/zfs/spa.c
@@ -1773,6 +1773,7 @@ static boolean_t
 spa_check_logs(spa_t *spa)
 {
        boolean_t rv = B_FALSE;
+       dsl_pool_t *dp = spa_get_dsl(spa);
 
        switch (spa->spa_log_state) {
        default:
@@ -1780,8 +1781,8 @@ spa_check_logs(spa_t *spa)
        case SPA_LOG_MISSING:
                /* need to recheck in case slog has been restored */
        case SPA_LOG_UNKNOWN:
-               rv = (dmu_objset_find(spa->spa_name, zil_check_log_chain,
-                   NULL, DS_FIND_CHILDREN) != 0);
+               rv = (dmu_objset_find_dp(dp, dp->dp_root_dir_obj,
+                   zil_check_log_chain, NULL, DS_FIND_CHILDREN) != 0);
                if (rv)
                        spa_set_log_state(spa, SPA_LOG_MISSING);
                break;
@@ -2763,6 +2764,7 @@ spa_load_impl(spa_t *spa, uint64_t pool_guid, nvlist_t *config,
            spa->spa_load_max_txg == UINT64_MAX)) {
                dmu_tx_t *tx;
                int need_update = B_FALSE;
+               dsl_pool_t *dp = spa_get_dsl(spa);
                int c;
 
                ASSERT(state != SPA_LOAD_TRYIMPORT);
@@ -2776,9 +2778,8 @@ spa_load_impl(spa_t *spa, uint64_t pool_guid, nvlist_t *config,
                 */
                spa->spa_claiming = B_TRUE;
 
-               tx = dmu_tx_create_assigned(spa_get_dsl(spa),
-                   spa_first_txg(spa));
-               (void) dmu_objset_find(spa_name(spa),
+               tx = dmu_tx_create_assigned(dp, spa_first_txg(spa));
+               (void) dmu_objset_find_dp(dp, dp->dp_root_dir_obj,
                    zil_claim, tx, DS_FIND_CHILDREN);
                dmu_tx_commit(tx);