diff options
| -rw-r--r-- | xlators/features/locks/src/posix.c | 25 | ||||
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-volume-set.c | 6 |
2 files changed, 21 insertions, 10 deletions
diff --git a/xlators/features/locks/src/posix.c b/xlators/features/locks/src/posix.c index af25a10aaa3..603bc585b4d 100644 --- a/xlators/features/locks/src/posix.c +++ b/xlators/features/locks/src/posix.c @@ -2592,6 +2592,20 @@ pl_client_destroy_cbk (xlator_t *this, client_t *client) return 0; } +int +reconfigure (xlator_t *this, dict_t *options) +{ + posix_locks_private_t *priv = NULL; + int ret = -1; + + priv = this->private; + + GF_OPTION_RECONF ("trace", priv->trace, options, bool, out); + + ret = 0; +out: + return ret; +} int init (xlator_t *this) @@ -2599,7 +2613,6 @@ init (xlator_t *this) posix_locks_private_t *priv = NULL; xlator_list_t *trav = NULL; data_t *mandatory = NULL; - data_t *trace = NULL; int ret = -1; if (!this->children || this->children->next) { @@ -2632,15 +2645,7 @@ init (xlator_t *this) gf_log (this->name, GF_LOG_WARNING, "mandatory locks not supported in this minor release."); - trace = dict_get (this->options, "trace"); - if (trace) { - if (gf_string2boolean (trace->data, - &priv->trace) == -1) { - gf_log (this->name, GF_LOG_ERROR, - "'trace' takes on only boolean values."); - goto out; - } - } + GF_OPTION_INIT ("trace", priv->trace, bool, out); this->local_pool = mem_pool_new (pl_local_t, 32); if (!this->local_pool) { diff --git a/xlators/mgmt/glusterd/src/glusterd-volume-set.c b/xlators/mgmt/glusterd/src/glusterd-volume-set.c index 116cb3349cf..f4c6cff1220 100644 --- a/xlators/mgmt/glusterd/src/glusterd-volume-set.c +++ b/xlators/mgmt/glusterd/src/glusterd-volume-set.c @@ -1678,6 +1678,12 @@ struct volopt_map_entry glusterd_volopt_map[] = { .voltype = "mgmt/glusterd", .op_version = GD_OP_VERSION_3_6_0, }, + { .key = "locks.trace", + .voltype = "features/locks", + .value = "disable", + .type = NO_DOC, + .op_version = GD_OP_VERSION_3_7_0, + }, { .key = NULL } }; |