diff options
| author | Martin K. Petersen <martin.petersen@oracle.com> | 2022-07-08 00:20:43 +0300 |
|---|---|---|
| committer | Martin K. Petersen <martin.petersen@oracle.com> | 2022-07-08 00:20:43 +0300 |
| commit | 11e50ed239b5b7f383874dd737283ae93f62ece3 (patch) | |
| tree | 6f990dd80caf1efee86926541b30cad9e2003cef /drivers/scsi/scsi_transport_iscsi.c | |
| parent | 88f1669019bd62b3009a3cebf772fbaaa21b9f38 (diff) | |
| parent | fce54ed027577517df1e74b7d54dc2b1bd536887 (diff) | |
| download | linux-11e50ed239b5b7f383874dd737283ae93f62ece3.tar.xz | |
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.c | 7 |
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", |