summaryrefslogtreecommitdiffstats
path: root/xlators
diff options
context:
space:
mode:
Diffstat (limited to 'xlators')
-rw-r--r--xlators/mgmt/glusterd/src/glusterd-handler.c10
-rw-r--r--xlators/mgmt/glusterd/src/glusterd-utils.c2
2 files changed, 8 insertions, 4 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-handler.c b/xlators/mgmt/glusterd/src/glusterd-handler.c
index a4af71e3bc1..552998ad058 100644
--- a/xlators/mgmt/glusterd/src/glusterd-handler.c
+++ b/xlators/mgmt/glusterd/src/glusterd-handler.c
@@ -1000,8 +1000,9 @@ glusterd_handle_create_volume (rpcsvc_request_t *req)
&tmpvolinfo, &tmpbrkinfo);
if (!ret) {
ret = -1;
- snprintf (err_str, sizeof (err_str), "Brick: %s:%s, %s"
- " in the arguments mean the same",
+ snprintf (err_str, sizeof (err_str), "Brick: %s:%s and "
+ "Brick: %s have overlapping export directories"
+ " from the same peer",
tmpbrkinfo->hostname, tmpbrkinfo->path,
brick);
goto out;
@@ -1422,8 +1423,9 @@ brick_val:
&tmpvolinfo, &tmpbrkinfo);
if (!ret) {
ret = -1;
- snprintf (err_str, sizeof (err_str), "Brick: %s:%s, %s"
- " in the arguments mean the same",
+ snprintf (err_str, sizeof (err_str), "Brick: %s:%s and "
+ "Brick: %s have overlapping export directories"
+ " from the same peer",
tmpbrkinfo->hostname, tmpbrkinfo->path,
brick);
goto out;
diff --git a/xlators/mgmt/glusterd/src/glusterd-utils.c b/xlators/mgmt/glusterd/src/glusterd-utils.c
index 1410af3225d..e2ab6d38bab 100644
--- a/xlators/mgmt/glusterd/src/glusterd-utils.c
+++ b/xlators/mgmt/glusterd/src/glusterd-utils.c
@@ -738,6 +738,7 @@ glusterd_volume_brickinfo_get (uuid_t uuid, char *hostname, char *path,
"given path %s lies"
" within %s", path,
brickiter->path);
+ *brickinfo = brickiter;
break;
}
} else
@@ -747,6 +748,7 @@ glusterd_volume_brickinfo_get (uuid_t uuid, char *hostname, char *path,
" %s", brickiter->path,
path);
ret = 0;
+ *brickinfo = brickiter;
break;
}
}