Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi
Pull SCSI fixes from James Bottomley:
"Three minor fixes, all in drivers"
* tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
scsi: mpt3sas: Fix incorrectly assigned error return and check
scsi: storvsc: Log TEST_UNIT_READY errors as warnings
scsi: lpfc: Move initialization of phba->poll_list earlier to avoid crash
+15
-4
+2
-1
drivers/scsi/lpfc/lpfc_init.c
+2
-1
drivers/scsi/lpfc/lpfc_init.c
···
13193
13193
if (!phba)
13194
13194
return -ENOMEM;
13195
13195
13196
+
INIT_LIST_HEAD(&phba->poll_list);
13197
+
13196
13198
/* Perform generic PCI device enabling operation */
13197
13199
error = lpfc_enable_pci_dev(phba);
13198
13200
if (error)
···
13329
13327
/* Enable RAS FW log support */
13330
13328
lpfc_sli4_ras_setup(phba);
13331
13329
13332
-
INIT_LIST_HEAD(&phba->poll_list);
13333
13330
timer_setup(&phba->cpuhp_poll_timer, lpfc_sli4_poll_hbtimer, 0);
13334
13331
cpuhp_state_add_instance_nocalls(lpfc_cpuhp_state, &phba->cpuhp);
13335
13332
+1
-1
drivers/scsi/mpt3sas/mpt3sas_base.c
+1
-1
drivers/scsi/mpt3sas/mpt3sas_base.c
+12
-2
drivers/scsi/storvsc_drv.c
+12
-2
drivers/scsi/storvsc_drv.c
···
1199
1199
vstor_packet->vm_srb.sense_info_length);
1200
1200
1201
1201
if (vstor_packet->vm_srb.scsi_status != 0 ||
1202
-
vstor_packet->vm_srb.srb_status != SRB_STATUS_SUCCESS)
1203
-
storvsc_log(device, STORVSC_LOGGING_ERROR,
1202
+
vstor_packet->vm_srb.srb_status != SRB_STATUS_SUCCESS) {
1203
+
1204
+
/*
1205
+
* Log TEST_UNIT_READY errors only as warnings. Hyper-V can
1206
+
* return errors when detecting devices using TEST_UNIT_READY,
1207
+
* and logging these as errors produces unhelpful noise.
1208
+
*/
1209
+
int loglevel = (stor_pkt->vm_srb.cdb[0] == TEST_UNIT_READY) ?
1210
+
STORVSC_LOGGING_WARN : STORVSC_LOGGING_ERROR;
1211
+
1212
+
storvsc_log(device, loglevel,
1204
1213
"tag#%d cmd 0x%x status: scsi 0x%x srb 0x%x hv 0x%x\n",
1205
1214
request->cmd->request->tag,
1206
1215
stor_pkt->vm_srb.cdb[0],
1207
1216
vstor_packet->vm_srb.scsi_status,
1208
1217
vstor_packet->vm_srb.srb_status,
1209
1218
vstor_packet->status);
1219
+
}
1210
1220
1211
1221
if (vstor_packet->vm_srb.scsi_status == SAM_STAT_CHECK_CONDITION &&
1212
1222
(vstor_packet->vm_srb.srb_status & SRB_STATUS_AUTOSENSE_VALID))