diff options
| author | Yaniv Kaul <ykaul@redhat.com> | 2018-09-13 16:03:23 +0300 |
|---|---|---|
| committer | Pranith Kumar Karampuri <pkarampu@redhat.com> | 2018-12-17 11:39:14 +0000 |
| commit | 403c69d35827b6cbb430e97a797c318cca81e86e (patch) | |
| tree | cd994bb5b8f133a1d8b1aa56d5c17deb3e91fae0 /xlators/cluster/afr/src/afr-self-heal-name.c | |
| parent | f0c46df09fe542d6a365adc0c544ba460598501c (diff) | |
AFR xlator: use dict_{setn|getn|deln|get_int32n|set_int32n|set_strn}
In a previous patch (https://review.gluster.org/20769) we've
added the key length to be passed to dict_* funcs, to remove the need
to strlen() it. This patch moves some xlators to use it.
- In some cases, moved strlen() of the key length outside of locks,
which is usually a good thing. Please verify it's safe to do so.
- In some cases, created a prefix for the keys, replacing something like
"%d-%d" with a "%s" in snprintf(). Not sure it adds value, but improves
readability.
Please review carefully.
Compile-tested only!
Change-Id: I04f2a1eb2ecfc3283d849d150d10d088ae7aa7f1
updates: bz#1193929
Signed-off-by: Yaniv Kaul <ykaul@redhat.com>
Diffstat (limited to 'xlators/cluster/afr/src/afr-self-heal-name.c')
| -rw-r--r-- | xlators/cluster/afr/src/afr-self-heal-name.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/xlators/cluster/afr/src/afr-self-heal-name.c b/xlators/cluster/afr/src/afr-self-heal-name.c index f3e5017189d..c4df5d4609d 100644 --- a/xlators/cluster/afr/src/afr-self-heal-name.c +++ b/xlators/cluster/afr/src/afr-self-heal-name.c @@ -277,9 +277,8 @@ afr_selfheal_name_gfid_mismatch_check(xlator_t *this, struct afr_reply *replies, bname, gfid_idx_iter, i, locked_on, gfid_idx, xdata); if (!ret && *gfid_idx >= 0) { - ret = dict_set_str(xdata, "gfid-heal-msg", - "GFID split-brain " - "resolved"); + ret = dict_set_sizen_str_sizen(xdata, "gfid-heal-msg", + "GFID split-brain resolved"); if (ret) gf_msg(this->name, GF_LOG_ERROR, 0, AFR_MSG_DICT_SET_FAILED, @@ -496,7 +495,7 @@ afr_selfheal_name_do(call_frame_t *frame, xlator_t *this, inode_t *parent, if (!xattr) return -ENOMEM; - ret = dict_set_int32(xattr, GF_GFIDLESS_LOOKUP, 1); + ret = dict_set_int32_sizen(xattr, GF_GFIDLESS_LOOKUP, 1); if (ret) { dict_unref(xattr); return -1; |