summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMohammed Rafi KC <rkavunga@redhat.com>2015-08-05 12:07:48 +0530
committerRaghavendra G <rgowdapp@redhat.com>2015-08-13 22:21:10 -0700
commit7641eb8b469a6dd4db6db59d2a5ef4d5a65e1a61 (patch)
tree33cecfeeb93f15fdfc3d114f397af40ee9690521
parentfdbff3c4d34296825c2aac023cb07519d922903d (diff)
rdma:restore device linked list structure in case of failure
We maintain a linked list strcture to store device information, and maintain head in a ctx variable. A new device will be added at the beginning of list. But if the device creation failed, then we need to adjust the linked list to proper state. Change-Id: I07cefd3b808d8973a915728b3ba7f2955d29c92a BUG: 1250297 Signed-off-by: Mohammed Rafi KC <rkavunga@redhat.com> Reviewed-on: http://review.gluster.org/11829 Tested-by: NetBSD Build System <jenkins@build.gluster.org> Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Raghavendra G <rgowdapp@redhat.com>
-rw-r--r--rpc/rpc-transport/rdma/src/rdma.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/rpc/rpc-transport/rdma/src/rdma.c b/rpc/rpc-transport/rdma/src/rdma.c
index 146bf87c45e..fe63d246adb 100644
--- a/rpc/rpc-transport/rdma/src/rdma.c
+++ b/rpc/rpc-transport/rdma/src/rdma.c
@@ -716,6 +716,10 @@ gf_rdma_get_device (rpc_transport_t *this, struct ibv_context *ibctx,
}
priv->device = trav;
trav->context = ibctx;
+
+ trav->next = rdma_ctx->device;
+ rdma_ctx->device = trav;
+
iobuf_pool->device[iobuf_pool->rdma_device_count] = trav;
iobuf_pool->mr_list[iobuf_pool->rdma_device_count++] = &trav->all_mr;
trav->request_ctx_pool
@@ -739,9 +743,6 @@ gf_rdma_get_device (rpc_transport_t *this, struct ibv_context *ibctx,
trav->device_name = gf_strdup (device_name);
- trav->next = rdma_ctx->device;
- rdma_ctx->device = trav;
-
trav->send_chan = ibv_create_comp_channel (trav->context);
if (!trav->send_chan) {
gf_msg (this->name, GF_LOG_ERROR, 0,
@@ -858,6 +859,7 @@ gf_rdma_get_device (rpc_transport_t *this, struct ibv_context *ibctx,
out:
if (trav != NULL) {
+ rdma_ctx->device = trav->next;
gf_rdma_destroy_posts (this);
mem_pool_destroy (trav->ioq_pool);
mem_pool_destroy (trav->request_ctx_pool);