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

Commit 8fc6c065 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Tejun Heo
Browse files

libata: call ->scsi_done from ata_scsi_simulate 



We always need to call ->scsi_done after we've finished emulating a
command, so do it in a single place at the end of ata_scsi_simulate.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarTejun Heo <tj@kernel.org>
parent 506db360

drivers/ata/libata-scsi.c

+7 −15
Original line number Original line Diff line number Diff line
@@ -484,13 +484,6 @@ struct device_attribute *ata_common_sdev_attrs[] = { 
};

};

EXPORT_SYMBOL_GPL(ata_common_sdev_attrs);

EXPORT_SYMBOL_GPL(ata_common_sdev_attrs);





static void ata_scsi_invalid_field(struct ata_device *dev,

				   struct scsi_cmnd *cmd, u16 field)

{

	ata_scsi_set_invalid_field(dev, cmd, field, 0xff);

	cmd->scsi_done(cmd);

}



/**

/**

 *	ata_std_bios_param - generic bios head/sector/cylinder calculator used by sd.

 *	ata_std_bios_param - generic bios head/sector/cylinder calculator used by sd.

 *	@sdev: SCSI device for which BIOS geometry is to be determined

 *	@sdev: SCSI device for which BIOS geometry is to be determined
@@ -2139,7 +2132,6 @@ static void ata_scsi_rbuf_fill(struct ata_scsi_args *args, 




	if (rc == 0)

	if (rc == 0)

		cmd->result = SAM_STAT_GOOD;

		cmd->result = SAM_STAT_GOOD;

	cmd->scsi_done(cmd);

}

}





/**

/**
@@ -4360,7 +4352,7 @@ void ata_scsi_simulate(struct ata_device *dev, struct scsi_cmnd *cmd) 
	switch(scsicmd[0]) {

	switch(scsicmd[0]) {

	case INQUIRY:

	case INQUIRY:

		if (scsicmd[1] & 2)		   /* is CmdDt set?  */

		if (scsicmd[1] & 2)		   /* is CmdDt set?  */

		    ata_scsi_invalid_field(dev, cmd, 1);

			ata_scsi_set_invalid_field(dev, cmd, 1, 0xff);

		else if ((scsicmd[1] & 1) == 0)    /* is EVPD clear? */

		else if ((scsicmd[1] & 1) == 0)    /* is EVPD clear? */

			ata_scsi_rbuf_fill(&args, ata_scsiop_inq_std);

			ata_scsi_rbuf_fill(&args, ata_scsiop_inq_std);

		else switch (scsicmd[2]) {

		else switch (scsicmd[2]) {
@@ -4392,7 +4384,7 @@ void ata_scsi_simulate(struct ata_device *dev, struct scsi_cmnd *cmd) 
			}

			}

			/* Fallthrough */

			/* Fallthrough */

		default:

		default:

			ata_scsi_invalid_field(dev, cmd, 2);

			ata_scsi_set_invalid_field(dev, cmd, 2, 0xff);

			break;

			break;

		}

		}

		break;

		break;
@@ -4410,7 +4402,7 @@ void ata_scsi_simulate(struct ata_device *dev, struct scsi_cmnd *cmd) 
		if ((scsicmd[1] & 0x1f) == SAI_READ_CAPACITY_16)

		if ((scsicmd[1] & 0x1f) == SAI_READ_CAPACITY_16)

			ata_scsi_rbuf_fill(&args, ata_scsiop_read_cap);

			ata_scsi_rbuf_fill(&args, ata_scsiop_read_cap);

		else

		else

			ata_scsi_invalid_field(dev, cmd, 1);

			ata_scsi_set_invalid_field(dev, cmd, 1, 0xff);

		break;

		break;





	case REPORT_LUNS:

	case REPORT_LUNS:
@@ -4420,7 +4412,6 @@ void ata_scsi_simulate(struct ata_device *dev, struct scsi_cmnd *cmd) 
	case REQUEST_SENSE:

	case REQUEST_SENSE:

		ata_scsi_set_sense(dev, cmd, 0, 0, 0);

		ata_scsi_set_sense(dev, cmd, 0, 0, 0);

		cmd->result = (DRIVER_SENSE << 24);

		cmd->result = (DRIVER_SENSE << 24);

		cmd->scsi_done(cmd);

		break;

		break;





	/* if we reach this, then writeback caching is disabled,

	/* if we reach this, then writeback caching is disabled,
@@ -4442,23 +4433,24 @@ void ata_scsi_simulate(struct ata_device *dev, struct scsi_cmnd *cmd) 
		if ((tmp8 == 0x4) && (!scsicmd[3]) && (!scsicmd[4]))

		if ((tmp8 == 0x4) && (!scsicmd[3]) && (!scsicmd[4]))

			ata_scsi_rbuf_fill(&args, ata_scsiop_noop);

			ata_scsi_rbuf_fill(&args, ata_scsiop_noop);

		else

		else

			ata_scsi_invalid_field(dev, cmd, 1);

			ata_scsi_set_invalid_field(dev, cmd, 1, 0xff);

		break;

		break;





	case MAINTENANCE_IN:

	case MAINTENANCE_IN:

		if (scsicmd[1] == MI_REPORT_SUPPORTED_OPERATION_CODES)

		if (scsicmd[1] == MI_REPORT_SUPPORTED_OPERATION_CODES)

			ata_scsi_rbuf_fill(&args, ata_scsiop_maint_in);

			ata_scsi_rbuf_fill(&args, ata_scsiop_maint_in);

		else

		else

			ata_scsi_invalid_field(dev, cmd, 1);

			ata_scsi_set_invalid_field(dev, cmd, 1, 0xff);

		break;

		break;





	/* all other commands */

	/* all other commands */

	default:

	default:

		ata_scsi_set_sense(dev, cmd, ILLEGAL_REQUEST, 0x20, 0x0);

		ata_scsi_set_sense(dev, cmd, ILLEGAL_REQUEST, 0x20, 0x0);

		/* "Invalid command operation code" */

		/* "Invalid command operation code" */

		cmd->scsi_done(cmd);

		break;

		break;

	}

	}



	cmd->scsi_done(cmd);

}

}





int ata_scsi_add_hosts(struct ata_host *host, struct scsi_host_template *sht)

int ata_scsi_add_hosts(struct ata_host *host, struct scsi_host_template *sht)