summaryrefslogtreecommitdiffstats
path: root/xlators/mgmt/glusterd
diff options
context:
space:
mode:
Diffstat (limited to 'xlators/mgmt/glusterd')
-rw-r--r--xlators/mgmt/glusterd/src/glusterd-store.c4
-rw-r--r--xlators/mgmt/glusterd/src/glusterd-store.h9
2 files changed, 8 insertions, 5 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-store.c b/xlators/mgmt/glusterd/src/glusterd-store.c
index 317f65e7975..84fd42d06cc 100644
--- a/xlators/mgmt/glusterd/src/glusterd-store.c
+++ b/xlators/mgmt/glusterd/src/glusterd-store.c
@@ -199,7 +199,7 @@ out:
int32_t
glusterd_store_remove_bricks (glusterd_volinfo_t *volinfo)
{
- int32_t ret = -1;
+ int32_t ret = 0;
glusterd_brickinfo_t *tmp = NULL;
glusterd_conf_t *priv = NULL;
char brickdir [PATH_MAX] = {0,};
@@ -786,7 +786,7 @@ int32_t
glusterd_store_retrieve_bricks (glusterd_volinfo_t *volinfo)
{
- int32_t ret = -1;
+ int32_t ret = 0;
glusterd_brickinfo_t *brickinfo = NULL;
glusterd_store_iter_t *iter = NULL;
char *key = NULL;
diff --git a/xlators/mgmt/glusterd/src/glusterd-store.h b/xlators/mgmt/glusterd/src/glusterd-store.h
index 9d7a6436e3f..8234463e0c5 100644
--- a/xlators/mgmt/glusterd/src/glusterd-store.h
+++ b/xlators/mgmt/glusterd/src/glusterd-store.h
@@ -56,10 +56,13 @@
#define glusterd_for_each_entry(entry, dir) \
do {\
- entry = readdir (dir);\
- while (entry && (!strcmp (entry->d_name, ".") ||\
- !strcmp (entry->d_name, ".."))) {\
+ entry = NULL;\
+ if (dir) {\
entry = readdir (dir);\
+ while (entry && (!strcmp (entry->d_name, ".") ||\
+ !strcmp (entry->d_name, ".."))) {\
+ entry = readdir (dir);\
+ }\
}\
} while (0); \