summaryrefslogtreecommitdiffstats
path: root/libglusterfs/src/quota-common-utils.c
diff options
context:
space:
mode:
Diffstat (limited to 'libglusterfs/src/quota-common-utils.c')
-rw-r--r--libglusterfs/src/quota-common-utils.c28
1 files changed, 15 insertions, 13 deletions
diff --git a/libglusterfs/src/quota-common-utils.c b/libglusterfs/src/quota-common-utils.c
index 7e271ad7d07..804e2f0ad4b 100644
--- a/libglusterfs/src/quota-common-utils.c
+++ b/libglusterfs/src/quota-common-utils.c
@@ -8,12 +8,12 @@
cases as published by the Free Software Foundation.
*/
-#include "dict.h"
-#include "logging.h"
-#include "byte-order.h"
-#include "quota-common-utils.h"
-#include "common-utils.h"
-#include "libglusterfs-messages.h"
+#include "glusterfs/dict.h"
+#include "glusterfs/logging.h"
+#include "glusterfs/byte-order.h"
+#include "glusterfs/quota-common-utils.h"
+#include "glusterfs/common-utils.h"
+#include "glusterfs/libglusterfs-messages.h"
gf_boolean_t
quota_meta_is_null(const quota_meta_t *meta)
@@ -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;