leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'mkp-scsi/4.9/scsi-fixes' into fixes

Browse Source
This commit is contained in:
James Bottomley 2016-10-27 08:37:29 -07:00
commit 49ce5b5f03
3 changed files with 6 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/scsi/arcmsr/arcmsr_hba.c
View File

@ -2636,18 +2636,9 @@ static int arcmsr_queue_command_lck(struct scsi_cmnd *cmd,
struct AdapterControlBlock *acb = (struct AdapterControlBlock *) host->hostdata; struct AdapterControlBlock *acb = (struct AdapterControlBlock *) host->hostdata;
struct CommandControlBlock *ccb; struct CommandControlBlock *ccb;
int target = cmd->device->id; int target = cmd->device->id;
int lun = cmd->device->lun;
uint8_t scsicmd = cmd->cmnd[0];
cmd->scsi_done = done; cmd->scsi_done = done;
cmd->host_scribble = NULL; cmd->host_scribble = NULL;
cmd->result = 0; cmd->result = 0;
if ((scsicmd == SYNCHRONIZE_CACHE) ||(scsicmd == SEND_DIAGNOSTIC)){
if(acb->devstate[target][lun] == ARECA_RAID_GONE) {
cmd->result = (DID_NO_CONNECT << 16);
}
cmd->scsi_done(cmd);
return 0;
}
if (target == 16) { if (target == 16) {
/* virtual device for iop message transfer */ /* virtual device for iop message transfer */
arcmsr_handle_virtual_command(acb, cmd); arcmsr_handle_virtual_command(acb, cmd);

13
drivers/scsi/megaraid/megaraid_sas_base.c
View File

@ -1700,16 +1700,13 @@ megasas_queue_command(struct Scsi_Host *shost, struct scsi_cmnd *scmd)
goto out_done; goto out_done;
} }
switch (scmd->cmnd[0]) { /*
case SYNCHRONIZE_CACHE: * FW takes care of flush cache on its own for Virtual Disk.
/* * No need to send it down for VD. For JBOD send SYNCHRONIZE_CACHE to FW.
* FW takes care of flush cache on its own */
* No need to send it down if ((scmd->cmnd[0] == SYNCHRONIZE_CACHE) && MEGASAS_IS_LOGICAL(scmd)) {
*/
scmd->result = DID_OK << 16; scmd->result = DID_OK << 16;
goto out_done; goto out_done;
default:
break;
} }
return instance->instancet->build_and_issue_cmd(instance, scmd); return instance->instancet->build_and_issue_cmd(instance, scmd);

1
drivers/scsi/scsi_debug.c
View File

@ -5134,6 +5134,7 @@ static void __exit scsi_debug_exit(void)
bus_unregister(&pseudo_lld_bus); bus_unregister(&pseudo_lld_bus);
root_device_unregister(pseudo_primary); root_device_unregister(pseudo_primary);
vfree(map_storep);
vfree(dif_storep); vfree(dif_storep);
vfree(fake_storep); vfree(fake_storep);
kfree(sdebug_q_arr); kfree(sdebug_q_arr);