Illumos 4171, 4172

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

diff --git a/module/zfs/zap_micro.c b/module/zfs/zap_micro.c
index 3c214750420df4833e785c04654f1021e5199cab..73d84b55431ff62b5a63756beed9dead74a8b36b 100644 (file)
--- a/module/zfs/zap_micro.c
+++ b/module/zfs/zap_micro.c
@@ -20,6 +20,7 @@
  */
 /*
  * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013 by Delphix. All rights reserved.
  */
 
 #include <sys/zio.h>
@@ -171,7 +172,7 @@ zap_name_free(zap_name_t *zn)
 zap_name_t *
 zap_name_alloc(zap_t *zap, const char *key, matchtype_t mt)
 {
-       zap_name_t *zn = kmem_alloc(sizeof (zap_name_t), KM_SLEEP);
+       zap_name_t *zn = kmem_alloc(sizeof (zap_name_t), KM_PUSHPAGE);
 
        zn->zn_zap = zap;
        zn->zn_key_intlen = sizeof (*key);
@@ -201,7 +202,7 @@ zap_name_alloc(zap_t *zap, const char *key, matchtype_t mt)
 zap_name_t *
 zap_name_alloc_uint64(zap_t *zap, const uint64_t *key, int numints)
 {
-       zap_name_t *zn = kmem_alloc(sizeof (zap_name_t), KM_SLEEP);
+       zap_name_t *zn = kmem_alloc(sizeof (zap_name_t), KM_PUSHPAGE);
 
        ASSERT(zap->zap_normflags == 0);
        zn->zn_zap = zap;
@@ -270,7 +271,7 @@ mze_insert(zap_t *zap, int chunkid, uint64_t hash)
        ASSERT(zap->zap_ismicro);
        ASSERT(RW_WRITE_HELD(&zap->zap_rwlock));
 
-       mze = kmem_alloc(sizeof (mzap_ent_t), KM_SLEEP);
+       mze = kmem_alloc(sizeof (mzap_ent_t), KM_PUSHPAGE);
        mze->mze_chunkid = chunkid;
        mze->mze_hash = hash;
        mze->mze_cd = MZE_PHYS(zap, mze)->mze_cd;
@@ -364,7 +365,7 @@ mzap_open(objset_t *os, uint64_t obj, dmu_buf_t *db)
 
        ASSERT3U(MZAP_ENT_LEN, ==, sizeof (mzap_ent_phys_t));
 
-       zap = kmem_zalloc(sizeof (zap_t), KM_SLEEP);
+       zap = kmem_zalloc(sizeof (zap_t), KM_PUSHPAGE);
        rw_init(&zap->zap_rwlock, NULL, RW_DEFAULT, NULL);
        rw_enter(&zap->zap_rwlock, RW_WRITER);
        zap->zap_objset = os;
@@ -460,7 +461,7 @@ zap_lockdir(objset_t *os, uint64_t obj, dmu_tx_t *tx,
        {
                dmu_object_info_t doi;
                dmu_object_info_from_db(db, &doi);
-               ASSERT(dmu_ot[doi.doi_type].ot_byteswap == zap_byteswap);
+               ASSERT3U(DMU_OT_BYTESWAP(doi.doi_type), ==, DMU_BSWAP_ZAP);
        }
 #endif
 
@@ -505,7 +506,7 @@ zap_lockdir(objset_t *os, uint64_t obj, dmu_tx_t *tx,
                        return (mzap_upgrade(zapp, tx, 0));
                }
                err = dmu_object_set_blocksize(os, obj, newsz, 0, tx);
-               ASSERT3U(err, ==, 0);
+               ASSERT0(err);
                zap->zap_m.zap_num_chunks =
                    db->db_size / MZAP_ENT_LEN - 1;
        }
@@ -532,7 +533,7 @@ mzap_upgrade(zap_t **zapp, dmu_tx_t *tx, zap_flags_t flags)
        ASSERT(RW_WRITE_HELD(&zap->zap_rwlock));
 
        sz = zap->zap_dbuf->db_size;
-       mzp = vmem_alloc(sz, KM_SLEEP);
+       mzp = kmem_alloc(sz, KM_PUSHPAGE | KM_NODEBUG);
        bcopy(zap->zap_dbuf->db_data, mzp, sz);
        nchunks = zap->zap_m.zap_num_chunks;
 
@@ -540,7 +541,7 @@ mzap_upgrade(zap_t **zapp, dmu_tx_t *tx, zap_flags_t flags)
                err = dmu_object_set_blocksize(zap->zap_objset, zap->zap_object,
                    1ULL << fzap_default_block_shift, 0, tx);
                if (err) {
-                       vmem_free(mzp, sz);
+                       kmem_free(mzp, sz);
                        return (err);
                }
        }
@@ -566,12 +567,12 @@ mzap_upgrade(zap_t **zapp, dmu_tx_t *tx, zap_flags_t flags)
                if (err)
                        break;
        }
-       vmem_free(mzp, sz);
+       kmem_free(mzp, sz);
        *zapp = zap;
        return (err);
 }
 
-static void
+void
 mzap_create_impl(objset_t *os, uint64_t obj, int normflags, zap_flags_t flags,
     dmu_tx_t *tx)
 {
@@ -584,7 +585,7 @@ mzap_create_impl(objset_t *os, uint64_t obj, int normflags, zap_flags_t flags,
        {
                dmu_object_info_t doi;
                dmu_object_info_from_db(db, &doi);
-               ASSERT(dmu_ot[doi.doi_type].ot_byteswap == zap_byteswap);
+               ASSERT3U(DMU_OT_BYTESWAP(doi.doi_type), ==, DMU_BSWAP_ZAP);
        }
 #endif
 
@@ -779,7 +780,7 @@ zap_lookup_norm(objset_t *os, uint64_t zapobj, const char *name,
        zn = zap_name_alloc(zap, name, mt);
        if (zn == NULL) {
                zap_unlockdir(zap);
-               return (ENOTSUP);
+               return (SET_ERROR(ENOTSUP));
        }
 
        if (!zap->zap_ismicro) {
@@ -788,12 +789,12 @@ zap_lookup_norm(objset_t *os, uint64_t zapobj, const char *name,
        } else {
                mze = mze_find(zn);
                if (mze == NULL) {
-                       err = ENOENT;
+                       err = SET_ERROR(ENOENT);
                } else {
                        if (num_integers < 1) {
-                               err = EOVERFLOW;
+                               err = SET_ERROR(EOVERFLOW);
                        } else if (integer_size != 8) {
-                               err = EINVAL;
+                               err = SET_ERROR(EINVAL);
                        } else {
                                *(uint64_t *)buf =
                                    MZE_PHYS(zap, mze)->mze_value;
@@ -825,7 +826,7 @@ zap_prefetch_uint64(objset_t *os, uint64_t zapobj, const uint64_t *key,
        zn = zap_name_alloc_uint64(zap, key, key_numints);
        if (zn == NULL) {
                zap_unlockdir(zap);
-               return (ENOTSUP);
+               return (SET_ERROR(ENOTSUP));
        }
 
        fzap_prefetch(zn);
@@ -848,7 +849,7 @@ zap_lookup_uint64(objset_t *os, uint64_t zapobj, const uint64_t *key,
        zn = zap_name_alloc_uint64(zap, key, key_numints);
        if (zn == NULL) {
                zap_unlockdir(zap);
-               return (ENOTSUP);
+               return (SET_ERROR(ENOTSUP));
        }
 
        err = fzap_lookup(zn, integer_size, num_integers, buf,
@@ -861,8 +862,8 @@ zap_lookup_uint64(objset_t *os, uint64_t zapobj, const uint64_t *key,
 int
 zap_contains(objset_t *os, uint64_t zapobj, const char *name)
 {
-       int err = (zap_lookup_norm(os, zapobj, name, 0,
-           0, NULL, MT_EXACT, NULL, 0, NULL));
+       int err = zap_lookup_norm(os, zapobj, name, 0,
+           0, NULL, MT_EXACT, NULL, 0, NULL);
        if (err == EOVERFLOW || err == EINVAL)
                err = 0; /* found, but skipped reading the value */
        return (err);
@@ -883,14 +884,14 @@ zap_length(objset_t *os, uint64_t zapobj, const char *name,
        zn = zap_name_alloc(zap, name, MT_EXACT);
        if (zn == NULL) {
                zap_unlockdir(zap);
-               return (ENOTSUP);
+               return (SET_ERROR(ENOTSUP));
        }
        if (!zap->zap_ismicro) {
                err = fzap_length(zn, integer_size, num_integers);
        } else {
                mze = mze_find(zn);
                if (mze == NULL) {
-                       err = ENOENT;
+                       err = SET_ERROR(ENOENT);
                } else {
                        if (integer_size)
                                *integer_size = 8;
@@ -917,7 +918,7 @@ zap_length_uint64(objset_t *os, uint64_t zapobj, const uint64_t *key,
        zn = zap_name_alloc_uint64(zap, key, key_numints);
        if (zn == NULL) {
                zap_unlockdir(zap);
-               return (ENOTSUP);
+               return (SET_ERROR(ENOTSUP));
        }
        err = fzap_length(zn, integer_size, num_integers);
        zap_name_free(zn);
@@ -937,7 +938,8 @@ mzap_addent(zap_name_t *zn, uint64_t value)
 
 #ifdef ZFS_DEBUG
        for (i = 0; i < zap->zap_m.zap_num_chunks; i++) {
-               ASSERTV(mzap_ent_phys_t *mze=&zap->zap_m.zap_phys->mz_chunk[i]);
+               ASSERTV(mzap_ent_phys_t *mze);
+               ASSERT(mze = &zap->zap_m.zap_phys->mz_chunk[i]);
                ASSERT(strcmp(zn->zn_key_orig, mze->mze_name) != 0);
        }
 #endif
@@ -986,7 +988,7 @@ zap_add(objset_t *os, uint64_t zapobj, const char *key,
        zn = zap_name_alloc(zap, key, MT_EXACT);
        if (zn == NULL) {
                zap_unlockdir(zap);
-               return (ENOTSUP);
+               return (SET_ERROR(ENOTSUP));
        }
        if (!zap->zap_ismicro) {
                err = fzap_add(zn, integer_size, num_integers, val, tx);
@@ -1000,7 +1002,7 @@ zap_add(objset_t *os, uint64_t zapobj, const char *key,
        } else {
                mze = mze_find(zn);
                if (mze != NULL) {
-                       err = EEXIST;
+                       err = SET_ERROR(EEXIST);
                } else {
                        mzap_addent(zn, *intval);
                }
@@ -1027,7 +1029,7 @@ zap_add_uint64(objset_t *os, uint64_t zapobj, const uint64_t *key,
        zn = zap_name_alloc_uint64(zap, key, key_numints);
        if (zn == NULL) {
                zap_unlockdir(zap);
-               return (ENOTSUP);
+               return (SET_ERROR(ENOTSUP));
        }
        err = fzap_add(zn, integer_size, num_integers, val, tx);
        zap = zn->zn_zap;       /* fzap_add() may change zap */
@@ -1064,7 +1066,7 @@ zap_update(objset_t *os, uint64_t zapobj, const char *name,
        zn = zap_name_alloc(zap, name, MT_EXACT);
        if (zn == NULL) {
                zap_unlockdir(zap);
-               return (ENOTSUP);
+               return (SET_ERROR(ENOTSUP));
        }
        if (!zap->zap_ismicro) {
                err = fzap_update(zn, integer_size, num_integers, val, tx);
@@ -1109,7 +1111,7 @@ zap_update_uint64(objset_t *os, uint64_t zapobj, const uint64_t *key,
        zn = zap_name_alloc_uint64(zap, key, key_numints);
        if (zn == NULL) {
                zap_unlockdir(zap);
-               return (ENOTSUP);
+               return (SET_ERROR(ENOTSUP));
        }
        err = fzap_update(zn, integer_size, num_integers, val, tx);
        zap = zn->zn_zap;       /* fzap_update() may change zap */
@@ -1140,14 +1142,14 @@ zap_remove_norm(objset_t *os, uint64_t zapobj, const char *name,
        zn = zap_name_alloc(zap, name, mt);
        if (zn == NULL) {
                zap_unlockdir(zap);
-               return (ENOTSUP);
+               return (SET_ERROR(ENOTSUP));
        }
        if (!zap->zap_ismicro) {
                err = fzap_remove(zn, tx);
        } else {
                mze = mze_find(zn);
                if (mze == NULL) {
-                       err = ENOENT;
+                       err = SET_ERROR(ENOENT);
                } else {
                        zap->zap_m.zap_num_entries--;
                        bzero(&zap->zap_m.zap_phys->mz_chunk[mze->mze_chunkid],
@@ -1174,7 +1176,7 @@ zap_remove_uint64(objset_t *os, uint64_t zapobj, const uint64_t *key,
        zn = zap_name_alloc_uint64(zap, key, key_numints);
        if (zn == NULL) {
                zap_unlockdir(zap);
-               return (ENOTSUP);
+               return (SET_ERROR(ENOTSUP));
        }
        err = fzap_remove(zn, tx);
        zap_name_free(zn);
@@ -1252,7 +1254,7 @@ zap_cursor_retrieve(zap_cursor_t *zc, zap_attribute_t *za)
        mzap_ent_t *mze;
 
        if (zc->zc_hash == -1ULL)
-               return (ENOENT);
+               return (SET_ERROR(ENOENT));
 
        if (zc->zc_zap == NULL) {
                int hb;
@@ -1278,8 +1280,6 @@ zap_cursor_retrieve(zap_cursor_t *zc, zap_attribute_t *za)
        if (!zc->zc_zap->zap_ismicro) {
                err = fzap_cursor_retrieve(zc->zc_zap, zc, za);
        } else {
-               err = ENOENT;
-
                mze_tofind.mze_hash = zc->zc_hash;
                mze_tofind.mze_cd = zc->zc_cd;
 
@@ -1302,6 +1302,7 @@ zap_cursor_retrieve(zap_cursor_t *zc, zap_attribute_t *za)
                        err = 0;
                } else {
                        zc->zc_hash = -1ULL;
+                       err = SET_ERROR(ENOENT);
                }
        }
        rw_exit(&zc->zc_zap->zap_rwlock);
@@ -1335,7 +1336,7 @@ zap_cursor_move_to_key(zap_cursor_t *zc, const char *name, matchtype_t mt)
        zn = zap_name_alloc(zc->zc_zap, name, mt);
        if (zn == NULL) {
                rw_exit(&zc->zc_zap->zap_rwlock);
-               return (ENOTSUP);
+               return (SET_ERROR(ENOTSUP));
        }
 
        if (!zc->zc_zap->zap_ismicro) {
@@ -1343,7 +1344,7 @@ zap_cursor_move_to_key(zap_cursor_t *zc, const char *name, matchtype_t mt)
        } else {
                mze = mze_find(zn);
                if (mze == NULL) {
-                       err = ENOENT;
+                       err = SET_ERROR(ENOENT);
                        goto out;
                }
                zc->zc_hash = mze->mze_hash;
@@ -1404,7 +1405,7 @@ zap_count_write(objset_t *os, uint64_t zapobj, const char *name, int add,
        }
 
        /*
-        * We lock the zap with adding ==  FALSE. Because, if we pass
+        * We lock the zap with adding == FALSE. Because, if we pass
         * the actual value of add, it could trigger a mzap_upgrade().
         * At present we are just evaluating the possibility of this operation
         * and hence we donot want to trigger an upgrade.
@@ -1456,17 +1457,44 @@ zap_count_write(objset_t *os, uint64_t zapobj, const char *name, int add,
 }
 
 #if defined(_KERNEL) && defined(HAVE_SPL)
-EXPORT_SYMBOL(zap_add);
 EXPORT_SYMBOL(zap_create);
-EXPORT_SYMBOL(zap_cursor_advance);
-EXPORT_SYMBOL(zap_cursor_fini);
-EXPORT_SYMBOL(zap_cursor_init);
-EXPORT_SYMBOL(zap_cursor_init_serialized);
-EXPORT_SYMBOL(zap_cursor_move_to_key);
-EXPORT_SYMBOL(zap_cursor_retrieve);
-EXPORT_SYMBOL(zap_cursor_serialize);
+EXPORT_SYMBOL(zap_create_norm);
+EXPORT_SYMBOL(zap_create_flags);
+EXPORT_SYMBOL(zap_create_claim);
+EXPORT_SYMBOL(zap_create_claim_norm);
+EXPORT_SYMBOL(zap_destroy);
 EXPORT_SYMBOL(zap_lookup);
 EXPORT_SYMBOL(zap_lookup_norm);
-EXPORT_SYMBOL(zap_remove);
+EXPORT_SYMBOL(zap_lookup_uint64);
+EXPORT_SYMBOL(zap_contains);
+EXPORT_SYMBOL(zap_prefetch_uint64);
+EXPORT_SYMBOL(zap_count_write);
+EXPORT_SYMBOL(zap_add);
+EXPORT_SYMBOL(zap_add_uint64);
 EXPORT_SYMBOL(zap_update);
+EXPORT_SYMBOL(zap_update_uint64);
+EXPORT_SYMBOL(zap_length);
+EXPORT_SYMBOL(zap_length_uint64);
+EXPORT_SYMBOL(zap_remove);
+EXPORT_SYMBOL(zap_remove_norm);
+EXPORT_SYMBOL(zap_remove_uint64);
+EXPORT_SYMBOL(zap_count);
+EXPORT_SYMBOL(zap_value_search);
+EXPORT_SYMBOL(zap_join);
+EXPORT_SYMBOL(zap_join_increment);
+EXPORT_SYMBOL(zap_add_int);
+EXPORT_SYMBOL(zap_remove_int);
+EXPORT_SYMBOL(zap_lookup_int);
+EXPORT_SYMBOL(zap_increment_int);
+EXPORT_SYMBOL(zap_add_int_key);
+EXPORT_SYMBOL(zap_lookup_int_key);
+EXPORT_SYMBOL(zap_increment);
+EXPORT_SYMBOL(zap_cursor_init);
+EXPORT_SYMBOL(zap_cursor_fini);
+EXPORT_SYMBOL(zap_cursor_retrieve);
+EXPORT_SYMBOL(zap_cursor_advance);
+EXPORT_SYMBOL(zap_cursor_serialize);
+EXPORT_SYMBOL(zap_cursor_move_to_key);
+EXPORT_SYMBOL(zap_cursor_init_serialized);
+EXPORT_SYMBOL(zap_get_stats);
 #endif