Commit cfbeb0b9 authored by Guoqing Jiang's avatar Guoqing Jiang Committed by Jason Gunthorpe

RDMA/rtrs-srv: Kill reject_w_econnreset label

We can goto reject_w_err label after initialize err with -ECONNRESET.

Link: https://lore.kernel.org/r/20210528113018.52290-2-jinpu.wang@ionos.comReviewed-by: default avatarMd Haris Iqbal <haris.iqbal@ionos.com>
Signed-off-by: default avatarGuoqing Jiang <guoqing.jiang@ionos.com>
Signed-off-by: default avatarGioh Kim <gi-oh.kim@ionos.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@nvidia.com>
parent 33e82346
...@@ -1780,33 +1780,33 @@ static int rtrs_rdma_connect(struct rdma_cm_id *cm_id, ...@@ -1780,33 +1780,33 @@ static int rtrs_rdma_connect(struct rdma_cm_id *cm_id,
u16 version, con_num, cid; u16 version, con_num, cid;
u16 recon_cnt; u16 recon_cnt;
int err; int err = -ECONNRESET;
if (len < sizeof(*msg)) { if (len < sizeof(*msg)) {
pr_err("Invalid RTRS connection request\n"); pr_err("Invalid RTRS connection request\n");
goto reject_w_econnreset; goto reject_w_err;
} }
if (le16_to_cpu(msg->magic) != RTRS_MAGIC) { if (le16_to_cpu(msg->magic) != RTRS_MAGIC) {
pr_err("Invalid RTRS magic\n"); pr_err("Invalid RTRS magic\n");
goto reject_w_econnreset; goto reject_w_err;
} }
version = le16_to_cpu(msg->version); version = le16_to_cpu(msg->version);
if (version >> 8 != RTRS_PROTO_VER_MAJOR) { if (version >> 8 != RTRS_PROTO_VER_MAJOR) {
pr_err("Unsupported major RTRS version: %d, expected %d\n", pr_err("Unsupported major RTRS version: %d, expected %d\n",
version >> 8, RTRS_PROTO_VER_MAJOR); version >> 8, RTRS_PROTO_VER_MAJOR);
goto reject_w_econnreset; goto reject_w_err;
} }
con_num = le16_to_cpu(msg->cid_num); con_num = le16_to_cpu(msg->cid_num);
if (con_num > 4096) { if (con_num > 4096) {
/* Sanity check */ /* Sanity check */
pr_err("Too many connections requested: %d\n", con_num); pr_err("Too many connections requested: %d\n", con_num);
goto reject_w_econnreset; goto reject_w_err;
} }
cid = le16_to_cpu(msg->cid); cid = le16_to_cpu(msg->cid);
if (cid >= con_num) { if (cid >= con_num) {
/* Sanity check */ /* Sanity check */
pr_err("Incorrect cid: %d >= %d\n", cid, con_num); pr_err("Incorrect cid: %d >= %d\n", cid, con_num);
goto reject_w_econnreset; goto reject_w_err;
} }
recon_cnt = le16_to_cpu(msg->recon_cnt); recon_cnt = le16_to_cpu(msg->recon_cnt);
srv = get_or_create_srv(ctx, &msg->paths_uuid, msg->first_conn); srv = get_or_create_srv(ctx, &msg->paths_uuid, msg->first_conn);
...@@ -1826,7 +1826,7 @@ static int rtrs_rdma_connect(struct rdma_cm_id *cm_id, ...@@ -1826,7 +1826,7 @@ static int rtrs_rdma_connect(struct rdma_cm_id *cm_id,
rtrs_err(s, "Session in wrong state: %s\n", rtrs_err(s, "Session in wrong state: %s\n",
rtrs_srv_state_str(sess->state)); rtrs_srv_state_str(sess->state));
mutex_unlock(&srv->paths_mutex); mutex_unlock(&srv->paths_mutex);
goto reject_w_econnreset; goto reject_w_err;
} }
/* /*
* Sanity checks * Sanity checks
...@@ -1835,13 +1835,13 @@ static int rtrs_rdma_connect(struct rdma_cm_id *cm_id, ...@@ -1835,13 +1835,13 @@ static int rtrs_rdma_connect(struct rdma_cm_id *cm_id,
rtrs_err(s, "Incorrect request: %d, %d\n", rtrs_err(s, "Incorrect request: %d, %d\n",
cid, con_num); cid, con_num);
mutex_unlock(&srv->paths_mutex); mutex_unlock(&srv->paths_mutex);
goto reject_w_econnreset; goto reject_w_err;
} }
if (s->con[cid]) { if (s->con[cid]) {
rtrs_err(s, "Connection already exists: %d\n", rtrs_err(s, "Connection already exists: %d\n",
cid); cid);
mutex_unlock(&srv->paths_mutex); mutex_unlock(&srv->paths_mutex);
goto reject_w_econnreset; goto reject_w_err;
} }
} else { } else {
sess = __alloc_sess(srv, cm_id, con_num, recon_cnt, sess = __alloc_sess(srv, cm_id, con_num, recon_cnt,
...@@ -1882,9 +1882,6 @@ static int rtrs_rdma_connect(struct rdma_cm_id *cm_id, ...@@ -1882,9 +1882,6 @@ static int rtrs_rdma_connect(struct rdma_cm_id *cm_id,
reject_w_err: reject_w_err:
return rtrs_rdma_do_reject(cm_id, err); return rtrs_rdma_do_reject(cm_id, err);
reject_w_econnreset:
return rtrs_rdma_do_reject(cm_id, -ECONNRESET);
close_and_return_err: close_and_return_err:
mutex_unlock(&srv->paths_mutex); mutex_unlock(&srv->paths_mutex);
close_sess(sess); close_sess(sess);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment