diff options
| -rw-r--r-- | xlators/cluster/dht/src/dht-common.c | 4 | ||||
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-geo-rep.c | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/xlators/cluster/dht/src/dht-common.c b/xlators/cluster/dht/src/dht-common.c index 04b5f1c2fe6..6816bfd356c 100644 --- a/xlators/cluster/dht/src/dht-common.c +++ b/xlators/cluster/dht/src/dht-common.c @@ -9052,8 +9052,6 @@ dht_mkdir_hashed_cbk(call_frame_t *frame, void *cookie, xlator_t *this, gf_boolean_t parent_layout_changed = _gf_false; call_stub_t *stub = NULL; - VALIDATE_OR_GOTO(this->private, err); - local = frame->local; prev = cookie; layout = local->layout; @@ -9644,8 +9642,6 @@ dht_rmdir_lock_cbk(call_frame_t *frame, void *cookie, xlator_t *this, int i = 0; xlator_t *hashed_subvol; - VALIDATE_OR_GOTO(this->private, err); - conf = this->private; local = frame->local; diff --git a/xlators/mgmt/glusterd/src/glusterd-geo-rep.c b/xlators/mgmt/glusterd/src/glusterd-geo-rep.c index 74275c60711..3bbc7dca20e 100644 --- a/xlators/mgmt/glusterd/src/glusterd-geo-rep.c +++ b/xlators/mgmt/glusterd/src/glusterd-geo-rep.c @@ -3435,6 +3435,12 @@ glusterd_op_stage_gsync_create(dict_t *dict, char **op_errstr) goto out; } + /* There is a remote possibility that slave_host can be NULL when + control reaches here. Add a check so we wouldn't crash in next + line */ + if (!slave_host) + goto out; + /* Now, check whether session is already started.If so, warn!*/ is_different_slavehost = (strcmp(slave_host, slave1.old_slvhost) != 0) ? _gf_true |