X-Git-Url: https://git.camperquake.de/gitweb.cgi?a=blobdiff_plain;f=module%2Fzfs%2Fzap_micro.c;h=7627504a990eeddfd10109fc579256ab0c9448f9;hb=1fde1e37208c2f56c72c70a06676676f04b65998;hp=cc061eec81c2a7231ba2cc8428509a1f93471327;hpb=c65aa5b2b9c48375ea1c451f252f0056e16f4e49;p=zfs.git diff --git a/module/zfs/zap_micro.c b/module/zfs/zap_micro.c index cc061ee..7627504 100644 --- a/module/zfs/zap_micro.c +++ b/module/zfs/zap_micro.c @@ -937,7 +937,7 @@ mzap_addent(zap_name_t *zn, uint64_t value) #ifdef ZFS_DEBUG for (i = 0; i < zap->zap_m.zap_num_chunks; i++) { - mzap_ent_phys_t *mze = &zap->zap_m.zap_phys->mz_chunk[i]; + ASSERTV(mzap_ent_phys_t *mze=&zap->zap_m.zap_phys->mz_chunk[i]); ASSERT(strcmp(zn->zn_key_orig, mze->mze_name) != 0); } #endif @@ -1043,12 +1043,13 @@ zap_update(objset_t *os, uint64_t zapobj, const char *name, { zap_t *zap; mzap_ent_t *mze; - uint64_t oldval; const uint64_t *intval = val; zap_name_t *zn; int err; #ifdef ZFS_DEBUG + uint64_t oldval; + /* * If there is an old value, it shouldn't change across the * lockdir (eg, due to bprewrite's xlation).