Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e12d8d51 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi 

Pull SCSI fixes from James Bottomley:
 "Two more important data integrity fixes related to RAID device drivers
  which wrongly throw away the SYNCHRONIZE CACHE command in the non-RAID
  path and a memory leak in the scsi_debug driver"

* tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
  scsi: arcmsr: Send SYNCHRONIZE_CACHE command to firmware
  scsi: scsi_debug: Fix memory leak if LBP enabled and module is unloaded
  scsi: megaraid_sas: Fix data integrity failure for JBOD (passthrough) devices
parents f29b909d 49ce5b5f

drivers/scsi/arcmsr/arcmsr_hba.c

+0 −9
Original line number Diff line number Diff line
@@ -2636,18 +2636,9 @@ static int arcmsr_queue_command_lck(struct scsi_cmnd *cmd, 
	struct AdapterControlBlock *acb = (struct AdapterControlBlock *) host->hostdata;

	struct CommandControlBlock *ccb;

	int target = cmd->device->id;

	int lun = cmd->device->lun;

	uint8_t scsicmd = cmd->cmnd[0];

	cmd->scsi_done = done;

	cmd->host_scribble = NULL;

	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) {

		/* virtual device for iop message transfer */

		arcmsr_handle_virtual_command(acb, cmd);

drivers/scsi/megaraid/megaraid_sas_base.c

+5 −8
Original line number Diff line number Diff line
@@ -1700,16 +1700,13 @@ megasas_queue_command(struct Scsi_Host *shost, struct scsi_cmnd *scmd) 
		goto out_done;

	}



	switch (scmd->cmnd[0]) {

	case SYNCHRONIZE_CACHE:

	/*

		 * FW takes care of flush cache on its own

		 * No need to send it down

	 * 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.

	 */

	if ((scmd->cmnd[0] == SYNCHRONIZE_CACHE) && MEGASAS_IS_LOGICAL(scmd)) {

		scmd->result = DID_OK << 16;

		goto out_done;

	default:

		break;

	}



	return instance->instancet->build_and_issue_cmd(instance, scmd);

drivers/scsi/scsi_debug.c

+1 −0
Original line number Diff line number Diff line
@@ -5134,6 +5134,7 @@ static void __exit scsi_debug_exit(void) 
	bus_unregister(&pseudo_lld_bus);

	root_device_unregister(pseudo_primary);



	vfree(map_storep);

	vfree(dif_storep);

	vfree(fake_storep);

	kfree(sdebug_q_arr);