summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorManikandan Selvaganesh <mselvaga@redhat.com>2015-02-05 10:59:48 +0530
committerShyamsundar Ranganathan <srangana@redhat.com>2015-03-03 06:40:40 -0800
commit4ff398987805ba72010d328c61a5682088d32cf4 (patch)
tree3376b20385319a1043a654f15aba091eb35da01c
parent1dc89418ec39929f6f9de448da85966beffeef27 (diff)
dht : logically dead code removed
CID :1124378 1124401 Change-Id: Ib48e4a8d3fb12c4e0323a3946afb46eeb3926984 BUG: 789278 Signed-off-by: Manikandan Selvaganesh <mselvaga@redhat.com> Reviewed-on: http://review.gluster.org/9584 Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: N Balachandran <nbalacha@redhat.com> Reviewed-by: Shyamsundar Ranganathan <srangana@redhat.com>
-rw-r--r--xlators/cluster/dht/src/dht-common.c12
-rw-r--r--xlators/cluster/dht/src/dht-rebalance.c4
2 files changed, 4 insertions, 12 deletions
diff --git a/xlators/cluster/dht/src/dht-common.c b/xlators/cluster/dht/src/dht-common.c
index 96acebda37b..ef816f53532 100644
--- a/xlators/cluster/dht/src/dht-common.c
+++ b/xlators/cluster/dht/src/dht-common.c
@@ -2864,14 +2864,10 @@ dht_getxattr (call_frame_t *frame, xlator_t *this,
op_errno = ENODATA;
goto err;
}
- if (hashed_subvol) {
- STACK_WIND (frame, dht_linkinfo_getxattr_cbk, hashed_subvol,
- hashed_subvol->fops->getxattr, loc,
- GF_XATTR_PATHINFO_KEY, xdata);
- return 0;
- }
- op_errno = ENODATA;
- goto err;
+ STACK_WIND (frame, dht_linkinfo_getxattr_cbk, hashed_subvol,
+ hashed_subvol->fops->getxattr, loc,
+ GF_XATTR_PATHINFO_KEY, xdata);
+ return 0;
}
if (key && (!strcmp (GF_XATTR_MARKER_KEY, key))
diff --git a/xlators/cluster/dht/src/dht-rebalance.c b/xlators/cluster/dht/src/dht-rebalance.c
index 383d215d235..466042c74a0 100644
--- a/xlators/cluster/dht/src/dht-rebalance.c
+++ b/xlators/cluster/dht/src/dht-rebalance.c
@@ -1699,7 +1699,6 @@ gf_defrag_fix_layout (xlator_t *this, gf_defrag_info_t *defrag, loc_t *loc,
gf_dirent_t *tmp = NULL;
gf_dirent_t *entry = NULL;
gf_boolean_t free_entries = _gf_false;
- dict_t *dict = NULL;
off_t offset = 0;
struct iatt iatt = {0,};
inode_t *linked_inode = NULL, *inode = NULL;
@@ -1855,9 +1854,6 @@ out:
loc_wipe (&entry_loc);
- if (dict)
- dict_unref(dict);
-
if (fd)
fd_unref (fd);