diff options
| author | Yaniv Kaul <ykaul@redhat.com> | 2018-09-23 11:04:22 +0300 |
|---|---|---|
| committer | Amar Tumballi <amarts@redhat.com> | 2018-09-26 04:17:30 +0000 |
| commit | 341ba81448e869ae388b4b37556e47f6bf7413a5 (patch) | |
| tree | 2867552e09e07d4320fc9cefb96a9533fc719658 /libglusterfs/src/quota-common-utils.c | |
| parent | 064b24900e1f5e3ba3087f7c6a0249613ebed61f (diff) | |
Quota related files: 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 code to use it.
Please review carefully.
Compile-tested only!
updates: bz#1193929
Signed-off-by: Yaniv Kaul <ykaul@redhat.com>
Change-Id: If4f425a9827be7c36ccfbb9761006ae824a818c6
Diffstat (limited to 'libglusterfs/src/quota-common-utils.c')
| -rw-r--r-- | libglusterfs/src/quota-common-utils.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/libglusterfs/src/quota-common-utils.c b/libglusterfs/src/quota-common-utils.c index 7e271ad7d07..fe6736493c6 100644 --- a/libglusterfs/src/quota-common-utils.c +++ b/libglusterfs/src/quota-common-utils.c @@ -25,13 +25,13 @@ quota_meta_is_null(const quota_meta_t *meta) } int32_t -quota_data_to_meta(data_t *data, char *key, quota_meta_t *meta) +quota_data_to_meta(data_t *data, quota_meta_t *meta) { int32_t ret = -1; quota_meta_t *value = NULL; int64_t *size = NULL; - if (!data || !key || !meta) + if (!data || !meta) goto out; if (data->len > sizeof(int64_t)) { @@ -66,7 +66,8 @@ out: } int32_t -quota_dict_get_inode_meta(dict_t *dict, char *key, quota_meta_t *meta) +quota_dict_get_inode_meta(dict_t *dict, char *key, const int keylen, + quota_meta_t *meta) { int32_t ret = -1; data_t *data = NULL; @@ -74,11 +75,11 @@ quota_dict_get_inode_meta(dict_t *dict, char *key, quota_meta_t *meta) if (!dict || !key || !meta) goto out; - data = dict_get(dict, key); + data = dict_getn(dict, key, keylen); if (!data || !data->data) goto out; - ret = quota_data_to_meta(data, key, meta); + ret = quota_data_to_meta(data, meta); out: @@ -86,11 +87,12 @@ out: } int32_t -quota_dict_get_meta(dict_t *dict, char *key, quota_meta_t *meta) +quota_dict_get_meta(dict_t *dict, char *key, const int keylen, + quota_meta_t *meta) { int32_t ret = -1; - ret = quota_dict_get_inode_meta(dict, key, meta); + ret = quota_dict_get_inode_meta(dict, key, keylen, meta); if (ret == -2) ret = 0; |