diff options
Diffstat (limited to 'xlators/mgmt/glusterd/src/glusterd-reset-brick.c')
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-reset-brick.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-reset-brick.c b/xlators/mgmt/glusterd/src/glusterd-reset-brick.c index cf04ce85541..e4d247a1d6c 100644 --- a/xlators/mgmt/glusterd/src/glusterd-reset-brick.c +++ b/xlators/mgmt/glusterd/src/glusterd-reset-brick.c @@ -18,7 +18,6 @@ #include "glusterd-utils.h" #include "glusterd-svc-mgmt.h" #include "glusterd-svc-helper.h" -#include "glusterd-nfs-svc.h" #include "glusterd-volgen.h" #include "glusterd-messages.h" #include "glusterd-mgmt.h" @@ -157,31 +156,34 @@ glusterd_reset_brick_prevalidate(dict_t *dict, char **op_errstr, peerinfo = glusterd_peerinfo_find(NULL, host); if (peerinfo == NULL) { + RCU_READ_UNLOCK; ret = -1; snprintf(msg, sizeof(msg), "%s, is not a friend.", host); *op_errstr = gf_strdup(msg); + goto out; } else if (!peerinfo->connected) { + RCU_READ_UNLOCK; + ret = -1; snprintf(msg, sizeof(msg), "%s," "is not connected at " "the moment.", host); *op_errstr = gf_strdup(msg); - ret = -1; + goto out; } else if (GD_FRIEND_STATE_BEFRIENDED != peerinfo->state.state) { + RCU_READ_UNLOCK; + ret = -1; snprintf(msg, sizeof(msg), "%s, is not befriended " "at the moment.", host); *op_errstr = gf_strdup(msg); - ret = -1; + goto out; } RCU_READ_UNLOCK; - - if (ret) - goto out; } if (!(gf_uuid_compare(dst_brickinfo->uuid, MY_UUID))) { |