Print this page
4171 clean up spa_feature_*() interfaces
4172 implement extensible_dataset feature for use by other zpool features
Reviewed by: Max Grossman <max.grossman@delphix.com>
Reviewed by: Christopher Siden <christopher.siden@delphix.com>
Reviewed by: George Wilson <george.wilson@delphix.com>

Split Close
Expand all
Collapse all
          --- old/usr/src/uts/common/fs/zfs/zap_micro.c
          +++ new/usr/src/uts/common/fs/zfs/zap_micro.c
↓ open down ↓ 564 lines elided ↑ open up ↑
 565  565                  zap = zn->zn_zap;       /* fzap_add_cd() may change zap */
 566  566                  zap_name_free(zn);
 567  567                  if (err)
 568  568                          break;
 569  569          }
 570  570          kmem_free(mzp, sz);
 571  571          *zapp = zap;
 572  572          return (err);
 573  573  }
 574  574  
 575      -static void
      575 +void
 576  576  mzap_create_impl(objset_t *os, uint64_t obj, int normflags, zap_flags_t flags,
 577  577      dmu_tx_t *tx)
 578  578  {
 579  579          dmu_buf_t *db;
 580  580          mzap_phys_t *zp;
 581  581  
 582  582          VERIFY(0 == dmu_buf_hold(os, obj, 0, FTAG, &db, DMU_READ_NO_PREFETCH));
 583  583  
 584  584  #ifdef ZFS_DEBUG
 585  585          {
↓ open down ↓ 269 lines elided ↑ open up ↑
 855  855          err = fzap_lookup(zn, integer_size, num_integers, buf,
 856  856              NULL, 0, NULL);
 857  857          zap_name_free(zn);
 858  858          zap_unlockdir(zap);
 859  859          return (err);
 860  860  }
 861  861  
 862  862  int
 863  863  zap_contains(objset_t *os, uint64_t zapobj, const char *name)
 864  864  {
 865      -        int err = (zap_lookup_norm(os, zapobj, name, 0,
 866      -            0, NULL, MT_EXACT, NULL, 0, NULL));
      865 +        int err = zap_lookup_norm(os, zapobj, name, 0,
      866 +            0, NULL, MT_EXACT, NULL, 0, NULL);
 867  867          if (err == EOVERFLOW || err == EINVAL)
 868  868                  err = 0; /* found, but skipped reading the value */
 869  869          return (err);
 870  870  }
 871  871  
 872  872  int
 873  873  zap_length(objset_t *os, uint64_t zapobj, const char *name,
 874  874      uint64_t *integer_size, uint64_t *num_integers)
 875  875  {
 876  876          zap_t *zap;
↓ open down ↓ 539 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX