From: Nicholas Bellinger <nab@xxxxxxxxxxxxxxx>
This patch removes the legacy use_port_guid_in_session_name module parameter
that is no longer required in modern ib_srpt code.
Reported-by: Roland Dreier <roland@xxxxxxxxxxxxxxx>
Cc: Roland Dreier <roland@xxxxxxxxxxxxxxx>
Cc: Bart Van Assche <bvanassche@xxxxxxx>
Signed-off-by: Nicholas A. Bellinger <nab@xxxxxxxxxxxxxxx>
---
drivers/infiniband/ulp/srpt/ib_srpt.c | 36 +++++---------------------------
1 files changed, 6 insertions(+), 30 deletions(-)
diff --git a/drivers/infiniband/ulp/srpt/ib_srpt.c b/drivers/infiniband/ulp/srpt/ib_srpt.c
index ae9fd0e..5c61ba4 100644
--- a/drivers/infiniband/ulp/srpt/ib_srpt.c
+++ b/drivers/infiniband/ulp/srpt/ib_srpt.c
@@ -103,12 +103,6 @@ module_param(srpt_sq_size, int, 0444);
MODULE_PARM_DESC(srpt_sq_size,
"Per-channel send queue (SQ) size.");
-static bool use_port_guid_in_session_name;
-module_param(use_port_guid_in_session_name, bool, 0444);
-MODULE_PARM_DESC(use_port_guid_in_session_name,
- "Use target port ID in the session name such that"
- " redundant paths between multiport systems can be masked.");
-
static int srpt_get_u64_x(char *buffer, struct kernel_param *kp)
{
return sprintf(buffer, "0x%016llx", *(u64 *)kp->arg);
@@ -2605,30 +2599,12 @@ static int srpt_cm_req_recv(struct ib_cm_id *cm_id,
" RTR failed (error code = %d)\n", ret);
goto destroy_ib;
}
-
- if (use_port_guid_in_session_name) {
- /*
- * If the kernel module parameter use_port_guid_in_session_name
- * has been specified, use a combination of the target port
- * GUID and the initiator port ID as the session name. This
- * was the original behavior of the SRP target implementation
- * (i.e. before the SRPT was included in OFED 1.3).
- */
- snprintf(ch->sess_name, sizeof(ch->sess_name),
- "0x%016llx%016llx",
- be64_to_cpu(*(__be64 *)
- &sdev->port[param->port - 1].gid.raw[8]),
- be64_to_cpu(*(__be64 *)(ch->i_port_id + 8)));
- } else {
- /*
- * Default behavior: use the initator port identifier as the
- * session name.
- */
- snprintf(ch->sess_name, sizeof(ch->sess_name),
- "0x%016llx%016llx",
- be64_to_cpu(*(__be64 *)ch->i_port_id),
- be64_to_cpu(*(__be64 *)(ch->i_port_id + 8)));
- }
+ /*
+ * Use the initator port identifier as the session name.
+ */
+ snprintf(ch->sess_name, sizeof(ch->sess_name), "0x%016llx%016llx",
+ be64_to_cpu(*(__be64 *)ch->i_port_id),
+ be64_to_cpu(*(__be64 *)(ch->i_port_id + 8)));
pr_debug("registering session %s\n", ch->sess_name);
--
1.7.2.5
--
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
