summaryrefslogtreecommitdiffstats
path: root/xlators/cluster/dht
diff options
context:
space:
mode:
authorN Balachandran <nbalacha@redhat.com>2016-09-22 10:38:21 +0530
committerRaghavendra G <rgowdapp@redhat.com>2016-09-22 22:32:53 -0700
commit9d7d81e8058aa89fc24bcc211cfad3618720292d (patch)
tree66ac6199c9ad2c5e10d431ec1a12377ab24a948f /xlators/cluster/dht
parenta412a4f50d8ca2ae68dbfa93b80757889150ce99 (diff)
cluster/dht: remove unnecessary struct member
Removed a structure member that was not used from dht_local_t. Skipped some unnecessary checks in dht_filter_loc_subvol_key. Change-Id: I81740b6528e063fb9cf5817e05865ff4d77aa748 BUG: 1378305 Signed-off-by: N Balachandran <nbalacha@redhat.com> Reviewed-on: http://review.gluster.org/15542 Smoke: Gluster Build System <jenkins@build.gluster.org> Reviewed-by: Shyamsundar Ranganathan <srangana@redhat.com> NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org> CentOS-regression: Gluster Build System <jenkins@build.gluster.org> Reviewed-by: Raghavendra G <rgowdapp@redhat.com>
Diffstat (limited to 'xlators/cluster/dht')
-rw-r--r--xlators/cluster/dht/src/dht-common.h2
-rw-r--r--xlators/cluster/dht/src/dht-helper.c8
2 files changed, 4 insertions, 6 deletions
diff --git a/xlators/cluster/dht/src/dht-common.h b/xlators/cluster/dht/src/dht-common.h
index 3a66e3477df..7adc849fb63 100644
--- a/xlators/cluster/dht/src/dht-common.h
+++ b/xlators/cluster/dht/src/dht-common.h
@@ -265,8 +265,6 @@ struct dht_local {
char xsel[256];
int32_t alloc_len;
- char *newpath;
-
/* gfid related */
uuid_t gfid;
diff --git a/xlators/cluster/dht/src/dht-helper.c b/xlators/cluster/dht/src/dht-helper.c
index 255c0823aac..a1210f1b273 100644
--- a/xlators/cluster/dht/src/dht-helper.c
+++ b/xlators/cluster/dht/src/dht-helper.c
@@ -304,8 +304,10 @@ dht_filter_loc_subvol_key (xlator_t *this, loc_t *loc, loc_t *new_loc,
int ret = 0; /* not found */
/* Why do other tasks if first required 'char' itself is not there */
- if (!new_loc || !loc || !loc->name || !strchr (loc->name, '@'))
- goto out;
+ if (!new_loc || !loc || !loc->name || !strchr (loc->name, '@')) {
+ /* Skip the GF_FREE checks here */
+ return ret;
+ }
trav = this->children;
while (trav) {
@@ -618,8 +620,6 @@ dht_local_wipe (xlator_t *this, dht_local_t *local)
dht_lock_array_free (local->lock.locks, local->lock.lk_count);
GF_FREE (local->lock.locks);
- GF_FREE (local->newpath);
-
GF_FREE (local->key);
if (local->rebalance.xdata)