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 /include | |
| 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 'include')
| -rw-r--r-- | include/sys/zap.h | 7 | ||||
| -rw-r--r-- | include/sys/zap_impl.h | 1 |
2 files changed, 1 insertions, 7 deletions
diff --git a/include/sys/zap.h b/include/sys/zap.h index fbd513098..bc15237bf 100644 --- a/include/sys/zap.h +++ b/include/sys/zap.h @@ -20,7 +20,7 @@ */ /* * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. - * Copyright (c) 2012 by Delphix. All rights reserved. + * Copyright (c) 2013 by Delphix. All rights reserved. */ #ifndef _SYS_ZAP_H @@ -381,11 +381,6 @@ void zap_cursor_advance(zap_cursor_t *zc); uint64_t zap_cursor_serialize(zap_cursor_t *zc); /* - * Advance the cursor to the attribute having the given key. - */ -int zap_cursor_move_to_key(zap_cursor_t *zc, const char *name, matchtype_t mt); - -/* * Initialize a zap cursor pointing to the position recorded by * zap_cursor_serialize (in the "serialized" argument). You can also * use a "serialized" argument of 0 to start at the beginning of the diff --git a/include/sys/zap_impl.h b/include/sys/zap_impl.h index 028018a16..528402f79 100644 --- a/include/sys/zap_impl.h +++ b/include/sys/zap_impl.h @@ -230,7 +230,6 @@ int fzap_add_cd(zap_name_t *zn, uint64_t integer_size, uint64_t num_integers, const void *val, uint32_t cd, dmu_tx_t *tx); void fzap_upgrade(zap_t *zap, dmu_tx_t *tx, zap_flags_t flags); -int fzap_cursor_move_to_key(zap_cursor_t *zc, zap_name_t *zn); #ifdef __cplusplus } |