summaryrefslogtreecommitdiffstats
path: root/xlators/protocol/server/src
diff options
context:
space:
mode:
Diffstat (limited to 'xlators/protocol/server/src')
-rw-r--r--xlators/protocol/server/src/server-rpc-fops.c7
-rw-r--r--xlators/protocol/server/src/server.c3
2 files changed, 8 insertions, 2 deletions
diff --git a/xlators/protocol/server/src/server-rpc-fops.c b/xlators/protocol/server/src/server-rpc-fops.c
index 21f78a38af4..91d5c030341 100644
--- a/xlators/protocol/server/src/server-rpc-fops.c
+++ b/xlators/protocol/server/src/server-rpc-fops.c
@@ -3487,6 +3487,13 @@ rpc_receive_common (rpcsvc_request_t *req, call_frame_t **fr,
SERVER_REQ_SET_ERROR (req, ret);
goto out;
}
+
+ if (!(*fr)->root->client->bound_xl->itable) {
+ /* inode_table is not allocated successful in server_setvolume */
+ SERVER_REQ_SET_ERROR (req, ret);
+ goto out;
+ }
+
ret = 0;
out:
diff --git a/xlators/protocol/server/src/server.c b/xlators/protocol/server/src/server.c
index 6dc9d0fffb0..6fcbbd6060d 100644
--- a/xlators/protocol/server/src/server.c
+++ b/xlators/protocol/server/src/server.c
@@ -1569,9 +1569,8 @@ notify (xlator_t *this, int32_t event, void *data, ...)
(*trav_p) = (*trav_p)->next;
glusterfs_mgmt_pmap_signout (ctx,
victim->name);
+ /* we need the protocol/server xlator here as 'this' */
glusterfs_autoscale_threads (THIS->ctx, -1);
- default_notify (victim, GF_EVENT_CLEANUP, data);
-
}
break;