From da505a63c12ea9be0e783711547fe7bbfecf05ea Mon Sep 17 00:00:00 2001
From: Anand Avati <avati@gluster.com>
Date: Sat, 23 Jan 2010 13:26:39 +0000
Subject: dht: initialize layout type

Instead of relying on CALLOC's zero initialization which happens
to be the value of DHT_HASH_TYPE_DM, explicitly set the value

Signed-off-by: Anand V. Avati <avati@amp.gluster.com>
Signed-off-by: Anand V. Avati <avati@dev.gluster.com>

BUG: 523 (Hash type is not initialized in dht_layout_new)
URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=523
---
 xlators/cluster/dht/src/dht-common.h | 5 +++++
 xlators/cluster/dht/src/dht-hashfn.c | 5 -----
 xlators/cluster/dht/src/dht-layout.c | 1 +
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/xlators/cluster/dht/src/dht-common.h b/xlators/cluster/dht/src/dht-common.h
index 5a43f9c0682..3997791d69a 100644
--- a/xlators/cluster/dht/src/dht-common.h
+++ b/xlators/cluster/dht/src/dht-common.h
@@ -50,6 +50,11 @@ struct dht_layout {
 typedef struct dht_layout dht_layout_t;
 
 
+typedef enum {
+	DHT_HASH_TYPE_DM,
+} dht_hashfn_type_t;
+
+
 struct dht_local {
 	int                      call_cnt;
 	loc_t                    loc;
diff --git a/xlators/cluster/dht/src/dht-hashfn.c b/xlators/cluster/dht/src/dht-hashfn.c
index 3d1b7c15286..dfc1541fa1e 100644
--- a/xlators/cluster/dht/src/dht-hashfn.c
+++ b/xlators/cluster/dht/src/dht-hashfn.c
@@ -29,11 +29,6 @@
 #include "hashfn.h"
 
 
-typedef enum {
-	DHT_HASH_TYPE_DM,
-} dht_hashfn_type_t;
-
-
 int
 dht_hash_compute_internal (int type, const char *name, uint32_t *hash_p)
 {
diff --git a/xlators/cluster/dht/src/dht-layout.c b/xlators/cluster/dht/src/dht-layout.c
index 4b7b44fc4e1..e43be876a6b 100644
--- a/xlators/cluster/dht/src/dht-layout.c
+++ b/xlators/cluster/dht/src/dht-layout.c
@@ -51,6 +51,7 @@ dht_layout_new (xlator_t *this, int cnt)
 		goto out;
 	}
 
+        layout->type = DHT_HASH_TYPE_DM;
 	layout->cnt = cnt;
         if (conf)
                 layout->gen = conf->gen;
-- 
cgit