Commit 82371332 authored by Roland Dreier's avatar Roland Dreier Committed by Ben Hutchings

target: REPORT LUNS should return LUN 0 even for dynamic ACLs

commit 9c395170 upstream.

If an initiator doesn't have any real LUNs assigned, we should report
LUN 0 and a LUN list length of 1.  Some versions of Solaris at least
go beserk if we report a LUN list length of 0.
Signed-off-by: default avatarRoland Dreier <roland@purestorage.com>
Signed-off-by: default avatarNicholas Bellinger <nab@linux-iscsi.org>
[bwh: Backported to 3.2: adjust filename, context]
Signed-off-by: default avatarBen Hutchings <ben@decadent.org.uk>
parent 966b20a3
...@@ -668,11 +668,8 @@ int target_report_luns(struct se_task *se_task) ...@@ -668,11 +668,8 @@ int target_report_luns(struct se_task *se_task)
* coming via a target_core_mod PASSTHROUGH op, and not through * coming via a target_core_mod PASSTHROUGH op, and not through
* a $FABRIC_MOD. In that case, report LUN=0 only. * a $FABRIC_MOD. In that case, report LUN=0 only.
*/ */
if (!se_sess) { if (!se_sess)
int_to_scsilun(0, (struct scsi_lun *)&buf[offset]);
lun_count = 1;
goto done; goto done;
}
spin_lock_irq(&se_sess->se_node_acl->device_list_lock); spin_lock_irq(&se_sess->se_node_acl->device_list_lock);
for (i = 0; i < TRANSPORT_MAX_LUNS_PER_TPG; i++) { for (i = 0; i < TRANSPORT_MAX_LUNS_PER_TPG; i++) {
...@@ -699,6 +696,14 @@ int target_report_luns(struct se_task *se_task) ...@@ -699,6 +696,14 @@ int target_report_luns(struct se_task *se_task)
* See SPC3 r07, page 159. * See SPC3 r07, page 159.
*/ */
done: done:
/*
* If no LUNs are accessible, report virtual LUN 0.
*/
if (lun_count == 0) {
int_to_scsilun(0, (struct scsi_lun *)&buf[offset]);
lun_count = 1;
}
lun_count *= 8; lun_count *= 8;
buf[0] = ((lun_count >> 24) & 0xff); buf[0] = ((lun_count >> 24) & 0xff);
buf[1] = ((lun_count >> 16) & 0xff); buf[1] = ((lun_count >> 16) & 0xff);
......
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