3 files changed, 15 insertions, 26 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-utils.c b/xlators/mgmt/glusterd/src/glusterd-utils.c
index dfdd795f186..fbf192ebdb7 100644
--- a/xlators/mgmt/glusterd/src/glusterd-utils.c
+++ b/xlators/mgmt/glusterd/src/glusterd-utils.c
@@ -1444,7 +1444,7 @@ glusterd_validate_and_create_brickpath (glusterd_brickinfo_t *brickinfo,
         struct stat  root_st             = {0,};
         char         msg[2048]           = {0,};
         gf_boolean_t is_created          = _gf_false;
-        char         index_basepath[PATH_MAX] = {0};
+        char         glusterfs_dir_path[PATH_MAX] = {0};
 
         ret = sys_mkdir (brickinfo->path, 0777);
         if (ret) {
@@ -1459,18 +1459,6 @@ glusterd_validate_and_create_brickpath (glusterd_brickinfo_t *brickinfo,
                 is_created = _gf_true;
         }
 
-        glusterd_get_index_basepath (brickinfo, index_basepath,
-                                     sizeof(index_basepath));
-
-        ret = mkdir_p (index_basepath, 0600, _gf_true);
-        if (ret && (errno != EEXIST)) {
-                snprintf (msg, sizeof (msg), "Failed to create index "
-                          "basepath (%s) for brick %s:%s. Reason : %s ",
-                          index_basepath, brickinfo->hostname,
-                          brickinfo->path, strerror (errno));
-                goto out;
-        }
-
         ret = sys_lstat (brickinfo->path, &brick_st);
         if (ret) {
                 snprintf (msg, sizeof (msg), "lstat failed on %s. Reason : %s",
@@ -1547,6 +1535,18 @@ glusterd_validate_and_create_brickpath (glusterd_brickinfo_t *brickinfo,
         if (ret)
                 goto out;
 
+        /* create .glusterfs directory */
+        snprintf (glusterfs_dir_path, sizeof (glusterfs_dir_path), "%s/%s",
+                  brickinfo->path, ".glusterfs");
+        ret = sys_mkdir (glusterfs_dir_path, 0600);
+        if (ret && (errno != EEXIST)) {
+                snprintf (msg, sizeof (msg), "Failed to create .glusterfs "
+                          "directory for brick %s:%s. Reason : %s ",
+                          brickinfo->hostname, brickinfo->path,
+                          strerror (errno));
+                goto out;
+        }
+
         ret = 0;
 
 out:
diff --git a/xlators/mgmt/glusterd/src/glusterd-utils.h b/xlators/mgmt/glusterd/src/glusterd-utils.h
index fce56b12e9c..ce3a7787be5 100644
--- a/xlators/mgmt/glusterd/src/glusterd-utils.h
+++ b/xlators/mgmt/glusterd/src/glusterd-utils.h
@@ -874,15 +874,4 @@ glusterd_brick_op_prerequisites (dict_t *dict,
 int
 glusterd_get_volinfo_from_brick (char *brick, glusterd_volinfo_t **volinfo);
 
-#define INDEX_BASEPATH ".glusterfs/indices"
-static inline void
-glusterd_get_index_basepath (glusterd_brickinfo_t *brickinfo, char *buffer,
-                             size_t size)
-{
-        if (!buffer)
-                return;
-        snprintf (buffer, size, "%s/%s", brickinfo->path, INDEX_BASEPATH);
-
-}
-
 #endif
diff --git a/xlators/mgmt/glusterd/src/glusterd-volgen.c b/xlators/mgmt/glusterd/src/glusterd-volgen.c
index 69629f201aa..b261889407c 100644
--- a/xlators/mgmt/glusterd/src/glusterd-volgen.c
+++ b/xlators/mgmt/glusterd/src/glusterd-volgen.c
@@ -2012,8 +2012,8 @@ brick_graph_add_index (volgen_graph_t *graph, glusterd_volinfo_t *volinfo,
         if (!xl)
                 goto out;
 
-        glusterd_get_index_basepath (brickinfo, index_basepath,
-                                     sizeof(index_basepath));
+        snprintf (index_basepath, sizeof (index_basepath), "%s/%s",
+                  brickinfo->path, ".glusterfs/indices");
 
         ret = xlator_set_option (xl, "index-base", index_basepath);
         if (ret)