c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2024-12-25 18:59:33 +03:00
Code Issues Packages Projects Releases Wiki Activity

Illumos 6681 - zfs list burning lots of time in dodefault() via dsl_prop_*

Browse Source 
6681 zfs list burning lots of time in dodefault() via dsl_prop_*
Reviewed by: Patrick Mooney <patrick.mooney@joyent.com>
Reviewed by: Matthew Ahrens <mahrens@delphix.com>
Reviewed by: Dan McDonald <danmcd@omniti.com>
Approved by: Matthew Ahrens <mahrens@delphix.com>

References:
  https://www.illumos.org/issues/6681
  https://github.com/illumos/illumos-gate/commit/d09e447

Ported-by: kernelOfTruth kerneloftruth@gmail.com
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes #4406
This commit is contained in:
Alex Wilson 2016-03-12 00:25:32 +01:00 committed by Brian Behlendorf
parent d76d9c696a
commit 887d1e60ef
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
module/zfs/dsl_prop.c
View File

@ -22,6 +22,7 @@
* Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2012, 2014 by Delphix. All rights reserved. * Copyright (c) 2012, 2014 by Delphix. All rights reserved.
* Copyright (c) 2013 Martin Matuska. All rights reserved. * Copyright (c) 2013 Martin Matuska. All rights reserved.
* Copyright 2015, Joyent, Inc.
*/ */
#include <sys/zfs_context.h> #include <sys/zfs_context.h>
@ -42,16 +43,14 @@
#define ZPROP_RECVD_SUFFIX "$recvd" #define ZPROP_RECVD_SUFFIX "$recvd"
static int static int
dodefault(const char *propname, int intsz, int numints, void *buf) dodefault(zfs_prop_t prop, int intsz, int numints, void *buf)
{ {
zfs_prop_t prop;
/* /*
* The setonce properties are read-only, BUT they still * The setonce properties are read-only, BUT they still
* have a default value that can be used as the initial * have a default value that can be used as the initial
* value. * value.
*/ */
if ((prop = zfs_name_to_prop(propname)) == ZPROP_INVAL || if (prop == ZPROP_INVAL ||
(zfs_prop_readonly(prop) && !zfs_prop_setonce(prop))) (zfs_prop_readonly(prop) && !zfs_prop_setonce(prop)))
return (SET_ERROR(ENOENT)); return (SET_ERROR(ENOENT));
@ -149,7 +148,7 @@ dsl_prop_get_dd(dsl_dir_t *dd, const char *propname,
} }
if (err == ENOENT) if (err == ENOENT)
err = dodefault(propname, intsz, numints, buf); err = dodefault(prop, intsz, numints, buf);
strfree(inheritstr); strfree(inheritstr);
strfree(recvdstr); strfree(recvdstr);
@ -660,7 +659,7 @@ dsl_prop_set_sync_impl(dsl_dataset_t *ds, const char *propname,
int err; int err;
uint64_t version = spa_version(ds->ds_dir->dd_pool->dp_spa); uint64_t version = spa_version(ds->ds_dir->dd_pool->dp_spa);
isint = (dodefault(propname, 8, 1, &intval) == 0); isint = (dodefault(zfs_name_to_prop(propname), 8, 1, &intval) == 0);
if (ds->ds_is_snapshot) { if (ds->ds_is_snapshot) {
ASSERT(version >= SPA_VERSION_SNAP_PROPS); ASSERT(version >= SPA_VERSION_SNAP_PROPS);
@ -1218,7 +1217,7 @@ dsl_prop_nvlist_add_uint64(nvlist_t *nv, zfs_prop_t prop, uint64_t value)
VERIFY(nvlist_alloc(&propval, NV_UNIQUE_NAME, KM_SLEEP) == 0); VERIFY(nvlist_alloc(&propval, NV_UNIQUE_NAME, KM_SLEEP) == 0);
VERIFY(nvlist_add_uint64(propval, ZPROP_VALUE, value) == 0); VERIFY(nvlist_add_uint64(propval, ZPROP_VALUE, value) == 0);
/* Indicate the default source if we can. */ /* Indicate the default source if we can. */
if (dodefault(propname, 8, 1, &default_value) == 0 && if (dodefault(prop, 8, 1, &default_value) == 0 &&
value == default_value) { value == default_value) {
VERIFY(nvlist_add_string(propval, ZPROP_SOURCE, "") == 0); VERIFY(nvlist_add_string(propval, ZPROP_SOURCE, "") == 0);
} }