diff options
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-handler.c | 10 | ||||
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-utils.c | 2 | 
2 files changed, 6 insertions, 6 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-handler.c b/xlators/mgmt/glusterd/src/glusterd-handler.c index bf601efcda5..df7a5f9fc91 100644 --- a/xlators/mgmt/glusterd/src/glusterd-handler.c +++ b/xlators/mgmt/glusterd/src/glusterd-handler.c @@ -1001,9 +1001,8 @@ glusterd_handle_create_volume (rpcsvc_request_t *req)                  if (!ret) {                          ret = -1;                          snprintf (err_str, sizeof (err_str), "Brick: %s:%s, %s" -                                  " in the arguments mean the same", -                                  tmpbrkinfo->hostname, tmpbrkinfo->path, -                                  brick); +                                  " one of the arguments contain the other", +                                  tmpbrkinfo->hostname, tmpbrkinfo->path, brick);                          goto out;                  }                  list_add_tail (&brickinfo->brick_list, &tmpvolinfo.bricks); @@ -1423,9 +1422,8 @@ brick_val:                  if (!ret) {                          ret = -1;                          snprintf (err_str, sizeof (err_str), "Brick: %s:%s, %s" -                                  " in the arguments mean the same", -                                  tmpbrkinfo->hostname, tmpbrkinfo->path, -                                  brick); +                                  " one of the arguments contain the other", +                                  tmpbrkinfo->hostname, tmpbrkinfo->path, brick);                          goto out;                  }                  list_add_tail (&brickinfo->brick_list, &tmpvolinfo.bricks); diff --git a/xlators/mgmt/glusterd/src/glusterd-utils.c b/xlators/mgmt/glusterd/src/glusterd-utils.c index ec3449de4e0..c1c9481e194 100644 --- a/xlators/mgmt/glusterd/src/glusterd-utils.c +++ b/xlators/mgmt/glusterd/src/glusterd-utils.c @@ -739,6 +739,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 @@ -748,6 +749,7 @@ glusterd_volume_brickinfo_get (uuid_t uuid, char *hostname, char *path,                                                          " %s", brickiter->path,                                                          path);                                                  ret = 0; +                                                *brickinfo = brickiter;                                                  break;                                          }                          }  | 
