3 files changed, 15 insertions, 1 deletions
diff --git a/xlators/cluster/dht/src/dht-common.c b/xlators/cluster/dht/src/dht-common.c
index 3b4fe36185d..a1b48649417 100644
--- a/xlators/cluster/dht/src/dht-common.c
+++ b/xlators/cluster/dht/src/dht-common.c
@@ -2644,6 +2644,9 @@ dht_readdir (call_frame_t *frame, xlator_t *this, fd_t *fd, size_t size,
                 }
         }
 
+        if (conf->use_readdirp)
+                op = GF_FOP_READDIRP;
+
         dht_do_readdir (frame, this, fd, size, yoff, op);
         return 0;
 }
diff --git a/xlators/cluster/dht/src/dht-common.h b/xlators/cluster/dht/src/dht-common.h
index dfdaf7e861c..464832c4125 100644
--- a/xlators/cluster/dht/src/dht-common.h
+++ b/xlators/cluster/dht/src/dht-common.h
@@ -155,6 +155,7 @@ struct dht_conf {
         gf_lock_t      layout_lock;
         void          *private;     /* Can be used by wrapper xlators over
                                        dht */
+        gf_boolean_t   use_readdirp;
 };
 typedef struct dht_conf dht_conf_t;
 
diff --git a/xlators/cluster/dht/src/dht.c b/xlators/cluster/dht/src/dht.c
index 13f382af1b2..c926a1cf400 100644
--- a/xlators/cluster/dht/src/dht.c
+++ b/xlators/cluster/dht/src/dht.c
@@ -294,7 +294,14 @@ init (xlator_t *this)
                           &temp_str) == 0) {
 	        gf_string2boolean (temp_str, &conf->unhashed_sticky_bit);
 	}
-        
+
+	conf->use_readdirp = 0;
+
+	if (dict_get_str (this->options, "use-readdirp",
+                          &temp_str) == 0) {
+	        gf_string2boolean (temp_str, &conf->use_readdirp);
+	}
+
         conf->disk_unit = 'p';
         conf->min_free_disk = 10;
 
@@ -435,5 +442,8 @@ struct volume_options options[] = {
         { .key = {"unhashed-sticky-bit"},
           .type = GF_OPTION_TYPE_BOOL
         },
+        { .key = {"use-readdirp"},
+          .type = GF_OPTION_TYPE_BOOL
+        },
 	{ .key  = {NULL} },
 };