diff options
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-utils.c | 20 | 
1 files changed, 11 insertions, 9 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-utils.c b/xlators/mgmt/glusterd/src/glusterd-utils.c index 4db538b0223..83342afb5c7 100644 --- a/xlators/mgmt/glusterd/src/glusterd-utils.c +++ b/xlators/mgmt/glusterd/src/glusterd-utils.c @@ -4193,22 +4193,23 @@ static int  glusterd_get_brick_root (char *path, char **mount_point)  {          char           *ptr            = NULL; +        char           *mnt_pt         = NULL;          struct stat     brickstat      = {0};          struct stat     buf            = {0};          if (!path)                  goto err; -        *mount_point = gf_strdup (path); -        if (!*mount_point) +        mnt_pt = gf_strdup (path); +        if (!mnt_pt)                  goto err; -        if (stat (*mount_point, &brickstat)) +        if (stat (mnt_pt, &brickstat))                  goto err; -        while ((ptr = strrchr (*mount_point, '/')) && -               ptr != *mount_point) { +        while ((ptr = strrchr (mnt_pt, '/')) && +               ptr != mnt_pt) {                  *ptr = '\0'; -                if (stat (*mount_point, &buf)) { +                if (stat (mnt_pt, &buf)) {                          gf_log (THIS->name, GF_LOG_ERROR, "error in "                                  "stat: %s", strerror (errno));                          goto err; @@ -4220,20 +4221,21 @@ glusterd_get_brick_root (char *path, char **mount_point)                  }          } -        if (ptr == *mount_point) { +        if (ptr == mnt_pt) {                  if (stat ("/", &buf)) {                          gf_log (THIS->name, GF_LOG_ERROR, "error in "                                  "stat: %s", strerror (errno));                          goto err;                  }                  if (brickstat.st_dev == buf.st_dev) -                        strcpy (*mount_point, "/"); +                        strcpy (mnt_pt, "/");          } +        *mount_point = mnt_pt;          return 0;   err: -        GF_FREE (*mount_point); +        GF_FREE (mnt_pt);          return -1;  }  | 
