From 5aac2b46024f6e0b2f7d38b06462c617db6de00d Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Mon, 12 Jul 2021 02:21:59 +0000 Subject: [PATCH] isert-scst: Introduce isert_conn_init() Minimize the diffs with the upstream code base by introducing the function isert_conn_init(). Signed-off-by: Chesnokov Gleb [ bvanassche: edited patch description ] git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@9478 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- iscsi-scst/kernel/isert-scst/iser_rdma.c | 26 +++++++++++++++--------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/iscsi-scst/kernel/isert-scst/iser_rdma.c b/iscsi-scst/kernel/isert-scst/iser_rdma.c index ae254ec6b..a13907cb9 100644 --- a/iscsi-scst/kernel/isert-scst/iser_rdma.c +++ b/iscsi-scst/kernel/isert-scst/iser_rdma.c @@ -1266,6 +1266,19 @@ fail_create_qp: goto out; } +static void +isert_init_conn(struct isert_conn *isert_conn) +{ + isert_conn->state = ISER_CONN_INIT; + INIT_LIST_HEAD(&isert_conn->rx_buf_list); + INIT_LIST_HEAD(&isert_conn->tx_free_list); + INIT_LIST_HEAD(&isert_conn->tx_busy_list); + spin_lock_init(&isert_conn->tx_lock); + spin_lock_init(&isert_conn->post_recv_lock); + kref_init(&isert_conn->kref); + mutex_init(&isert_conn->state_mutex); +} + static struct isert_conn *isert_conn_create(struct rdma_cm_id *cm_id, struct isert_device *isert_dev) { @@ -1281,7 +1294,9 @@ static struct isert_conn *isert_conn_create(struct rdma_cm_id *cm_id, err = -ENOMEM; goto fail_alloc; } - isert_conn->state = ISER_CONN_INIT; + + isert_init_conn(isert_conn); + isert_conn->cm_id = cm_id; isert_conn->isert_dev = isert_dev; @@ -1307,12 +1322,6 @@ static struct isert_conn *isert_conn_create(struct rdma_cm_id *cm_id, goto fail_login_req_pdu; } - INIT_LIST_HEAD(&isert_conn->rx_buf_list); - INIT_LIST_HEAD(&isert_conn->tx_free_list); - INIT_LIST_HEAD(&isert_conn->tx_busy_list); - spin_lock_init(&isert_conn->tx_lock); - spin_lock_init(&isert_conn->post_recv_lock); - isert_conn->login_req_pdu = isert_rx_pdu_alloc(isert_conn, ISER_MAX_LOGIN_RDSL); if (unlikely(!isert_conn->login_req_pdu)) { @@ -1340,9 +1349,6 @@ static struct isert_conn *isert_conn_create(struct rdma_cm_id *cm_id, goto fail_post_recv; } - kref_init(&isert_conn->kref); - mutex_init(&isert_conn->state_mutex); - TRACE_EXIT(); return isert_conn;