Skip to content
Permalink
Browse files

review comments

  • Loading branch information...
shartse committed Apr 2, 2019
1 parent 541cf4f commit 46c2041754fe7a08af8ba0aaff73f8f4b8f42740
Showing with 12 additions and 25 deletions.
  1. +8 −1 module/zcommon/zfeature_common.c
  2. +1 −2 module/zfs/bpobj.c
  3. +3 −3 module/zfs/dsl_dir.c
  4. +0 −1 module/zfs/zthr.c
  5. +0 −18 tests/zfs-tests/include/libtest.shlib
@@ -348,10 +348,17 @@ zpool_feature_init(void)
ZFEATURE_FLAG_MOS | ZFEATURE_FLAG_ACTIVATE_ON_ENABLE,
ZFEATURE_TYPE_BOOLEAN, NULL);

{
static const spa_feature_t livelist_deps[] = {
SPA_FEATURE_EXTENSIBLE_DATASET,
SPA_FEATURE_NONE
};
zfeature_register(SPA_FEATURE_LIVELIST,
"com.delphix:livelist", "livelist",
"Improved clone deletion performance.",
ZFEATURE_FLAG_READONLY_COMPAT, ZFEATURE_TYPE_BOOLEAN, NULL);
ZFEATURE_FLAG_READONLY_COMPAT, ZFEATURE_TYPE_BOOLEAN,
livelist_deps);
}

{
static const spa_feature_t large_blocks_deps[] = {
@@ -277,7 +277,6 @@ bpobj_iterate_blkptrs(bpobj_info_t *bpi, bpobj_itor_t func, void *arg,
for (int64_t i = bpo->bpo_phys->bpo_num_blkptrs - 1; i >= start; i--) {
uint64_t offset = i * sizeof (blkptr_t);
uint64_t blkoff = P2PHASE(i, bpo->bpo_epb);
boolean_t bp_freed;

if (dbuf == NULL || dbuf->db_offset > offset) {
if (dbuf)
@@ -294,7 +293,7 @@ bpobj_iterate_blkptrs(bpobj_info_t *bpi, bpobj_itor_t func, void *arg,
blkptr_t *bparray = dbuf->db_data;
blkptr_t *bp = &bparray[blkoff];

bp_freed = BP_GET_FREE(bp);
boolean_t bp_freed = BP_GET_FREE(bp);
err = func(arg, bp, bp_freed, tx);
if (err)
break;
@@ -2298,9 +2298,9 @@ dsl_dir_remove_livelist(dsl_dir_t *dd, dmu_tx_t *tx, boolean_t total)
* condensed.
*
* We can be sure that the to_condense struct will not
* be repopulated during the execution of this function
* because dsl_livelist_try_condense excutes in syncing
* context.
* be repopulated at this stage because both this
* function and dsl_livelist_try_condense execute in
* syncing context.
*/
if ((spa->spa_to_condense.ds != NULL) &&
!spa->spa_to_condense.syncing) {
@@ -488,7 +488,6 @@ zthr_finish(zthr_t *t)
* control back we expect that the zthr has completed it's
* zthr_func.
*/

if (t->zthr_thread != NULL) {
t->zthr_finish = B_TRUE;

@@ -3548,24 +3548,6 @@ function mdb_get_uint32
return 0
}

#
# Get the hexadecimal value of global variable using mdb.
#
function mdb_get_hex
{
typeset variable=$1
typeset value

value=$(mdb -k -e "$variable::print -x")
if [[ $? -ne 0 ]]; then
log_fail "Failed to get value of '$variable' from mdb."
return 1
fi

echo $value
return 0
}

#
# Set global uint32_t variable to a decimal value using mdb.
#

0 comments on commit 46c2041

Please sign in to comment.
You can’t perform that action at this time.