From 0a9ca8162725b2f6b17a4d2e8cc863d27bb8770e Mon Sep 17 00:00:00 2001 From: Yaniv Kaul Date: Wed, 9 Oct 2019 00:25:42 +0300 Subject: dict.{c,h}: remove the lock from the _data struct I'm not sure why it was there and I did not see any use for it. In the hope I did not miss anything, I removed it. Change-Id: I02fa2e8e2a598b488fddbff4c7168dc4a41929b2 updates: bz#1193929 Signed-off-by: Yaniv Kaul --- libglusterfs/src/dict.c | 4 ---- libglusterfs/src/glusterfs/dict.h | 1 - 2 files changed, 5 deletions(-) diff --git a/libglusterfs/src/dict.c b/libglusterfs/src/dict.c index 12184f03343..b790c93ec65 100644 --- a/libglusterfs/src/dict.c +++ b/libglusterfs/src/dict.c @@ -57,7 +57,6 @@ get_new_data() GF_ATOMIC_INIT(data->refcount, 0); data->is_static = _gf_false; - LOCK_INIT(&data->lock); return data; } @@ -293,8 +292,6 @@ void data_destroy(data_t *data) { if (data) { - LOCK_DESTROY(&data->lock); - if (!data->is_static) GF_FREE(data->data); @@ -325,7 +322,6 @@ data_copy(data_t *old) } newdata->data_type = old->data_type; - LOCK_INIT(&newdata->lock); return newdata; err_out: diff --git a/libglusterfs/src/glusterfs/dict.h b/libglusterfs/src/glusterfs/dict.h index 35337251360..bfb01afb9b9 100644 --- a/libglusterfs/src/glusterfs/dict.h +++ b/libglusterfs/src/glusterfs/dict.h @@ -97,7 +97,6 @@ typedef struct _data_pair data_pair_t; struct _data { char *data; gf_atomic_t refcount; - gf_lock_t lock; gf_dict_data_type_t data_type; int32_t len; gf_boolean_t is_static; -- cgit