diff options
| author | Matthew Ahrens <[email protected]> | 2014-11-03 11:12:40 -0800 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2015-05-04 09:41:09 -0700 |
| commit | 83017311e4a64bc49d43d1f8c93fc0e2263bb41b (patch) | |
| tree | 7a428bfc65087cc6c90bf86436b3248f34bc449c /module/zfs/zap_micro.c | |
| parent | 6102d0376ecfbcc1f63819bc1046ee78b7f3d4fc (diff) | |
Illumos 3654,3656
3654 zdb should print number of ganged blocks
3656 remove unused function zap_cursor_move_to_key()
Reviewed by: George Wilson <[email protected]>
Reviewed by: Christopher Siden <[email protected]>
Reviewed by: Dan McDonald <[email protected]>
Approved by: Garrett D'Amore <[email protected]>
References:
https://www.illumos.org/issues/3654
https://www.illumos.org/issues/3656
https://github.com/illumos/illumos-gate/commit/d5ee8a1
Porting Notes:
3655 and 3657 were part of this commit but those hunks were dropped
since they apply to mdb.
Ported by: Brian Behlendorf <[email protected]>
Diffstat (limited to 'module/zfs/zap_micro.c')
| -rw-r--r-- | module/zfs/zap_micro.c | 41 |
1 files changed, 0 insertions, 41 deletions
diff --git a/module/zfs/zap_micro.c b/module/zfs/zap_micro.c index 256bc8de9..5af98c2bc 100644 --- a/module/zfs/zap_micro.c +++ b/module/zfs/zap_micro.c @@ -1318,46 +1318,6 @@ zap_cursor_advance(zap_cursor_t *zc) } int -zap_cursor_move_to_key(zap_cursor_t *zc, const char *name, matchtype_t mt) -{ - int err = 0; - mzap_ent_t *mze; - zap_name_t *zn; - - if (zc->zc_zap == NULL) { - err = zap_lockdir(zc->zc_objset, zc->zc_zapobj, NULL, - RW_READER, TRUE, FALSE, &zc->zc_zap); - if (err) - return (err); - } else { - rw_enter(&zc->zc_zap->zap_rwlock, RW_READER); - } - - zn = zap_name_alloc(zc->zc_zap, name, mt); - if (zn == NULL) { - rw_exit(&zc->zc_zap->zap_rwlock); - return (SET_ERROR(ENOTSUP)); - } - - if (!zc->zc_zap->zap_ismicro) { - err = fzap_cursor_move_to_key(zc, zn); - } else { - mze = mze_find(zn); - if (mze == NULL) { - err = SET_ERROR(ENOENT); - goto out; - } - zc->zc_hash = mze->mze_hash; - zc->zc_cd = mze->mze_cd; - } - -out: - zap_name_free(zn); - rw_exit(&zc->zc_zap->zap_rwlock); - return (err); -} - -int zap_get_stats(objset_t *os, uint64_t zapobj, zap_stats_t *zs) { int err; @@ -1494,7 +1454,6 @@ 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 |