aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/scsi_transport_iscsi.c
diff options
context:
space:
mode:
authorMartin K. Petersen <martin.petersen@oracle.com>2022-07-07 17:20:43 -0400
committerMartin K. Petersen <martin.petersen@oracle.com>2022-07-07 17:20:43 -0400
commit11e50ed239b5b7f383874dd737283ae93f62ece3 (patch)
tree6f990dd80caf1efee86926541b30cad9e2003cef /drivers/scsi/scsi_transport_iscsi.c
parentscsi: sd: Rework asynchronous resume support (diff)
parentscsi: hisi_sas: Limit max hw sectors for v3 HW (diff)
downloadlinux-dev-11e50ed239b5b7f383874dd737283ae93f62ece3.tar.xz
linux-dev-11e50ed239b5b7f383874dd737283ae93f62ece3.zip
Merge branch '5.19/scsi-fixes' into 5.20/scsi-staging
Bring in fixes to resolve a merge conflict in the lpfc driver update. Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Diffstat (limited to 'drivers/scsi/scsi_transport_iscsi.c')
-rw-r--r--drivers/scsi/scsi_transport_iscsi.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/scsi/scsi_transport_iscsi.c b/drivers/scsi/scsi_transport_iscsi.c
index 8be99d044425..cd3db9684e52 100644
--- a/drivers/scsi/scsi_transport_iscsi.c
+++ b/drivers/scsi/scsi_transport_iscsi.c
@@ -212,7 +212,12 @@ iscsi_create_endpoint(int dd_size)
return NULL;
mutex_lock(&iscsi_ep_idr_mutex);
- id = idr_alloc(&iscsi_ep_idr, ep, 0, -1, GFP_NOIO);
+
+ /*
+ * First endpoint id should be 1 to comply with user space
+ * applications (iscsid).
+ */
+ id = idr_alloc(&iscsi_ep_idr, ep, 1, -1, GFP_NOIO);
if (id < 0) {
mutex_unlock(&iscsi_ep_idr_mutex);
printk(KERN_ERR "Could not allocate endpoint ID. Error %d.\n",