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

Commit c65be1a6 authored Jun 25, 2018 by Johannes Thumshirn Committed by Martin K. Petersen Jun 26, 2018

scsi: core: check for equality of result byte values



When evaluating a SCSI command's result using the field access macros,
check for equality of the fields and not if a specific bit is set.

This is a preparation patch, for reworking the results field in the
SCSI command.

Signed-off-by: Johannes Thumshirn <jthumshirn@suse.de>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Bart Van Assche <bart.vanassche@wdc.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

parent 8e1695a0

drivers/scsi/ch.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -199,7 +199,7 @@ ch_do_scsi(scsi_changer ch, unsigned char cmd, int cmd_len,
		buflength, &sshdr, timeout * HZ,
		MAX_RETRIES, NULL);

		if (driver_byte(result) & DRIVER_SENSE) {
		if (driver_byte(result) == DRIVER_SENSE) {
		if (debug)
		scsi_print_sense_hdr(ch->device, ch->name, &sshdr);
		errno = ch_find_errno(&sshdr);

drivers/scsi/dc395x.c

+2 −3

Original line number	Diff line number	Diff line
		@@ -3473,9 +3473,8 @@ static void srb_done(struct AdapterCtlBlk acb, struct DeviceCtlBlk dcb,

		/if( srb->cmd->cmnd[0] == INQUIRY && /
		/* (host_byte(cmd->result) == DID_OK \|\| status_byte(cmd->result) & CHECK_CONDITION) ) */
		if ((cmd->result == (DID_OK << 16)
		\|\| status_byte(cmd->result) &
		CHECK_CONDITION)) {
		if ((cmd->result == (DID_OK << 16) \|\|
		status_byte(cmd->result) == CHECK_CONDITION)) {
		if (!dcb->init_tcq_flag) {
		add_dev(acb, dcb, ptr);
		dcb->init_tcq_flag = 1;

drivers/scsi/scsi.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -162,7 +162,7 @@ void scsi_log_completion(struct scsi_cmnd *cmd, int disposition)
		(level > 1)) {
		scsi_print_result(cmd, "Done", disposition);
		scsi_print_command(cmd);
		if (status_byte(cmd->result) & CHECK_CONDITION)
		if (status_byte(cmd->result) == CHECK_CONDITION)
		scsi_print_sense(cmd);
		if (level > 3)
		scmd_printk(KERN_INFO, cmd,

drivers/scsi/scsi_ioctl.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -100,8 +100,8 @@ static int ioctl_internal_command(struct scsi_device sdev, char cmd,
		SCSI_LOG_IOCTL(2, sdev_printk(KERN_INFO, sdev,
		"Ioctl returned 0x%x\n", result));

		if ((driver_byte(result) & DRIVER_SENSE) &&
		(scsi_sense_valid(&sshdr))) {
		if (driver_byte(result) == DRIVER_SENSE &&
		scsi_sense_valid(&sshdr)) {
		switch (sshdr.sense_key) {
		case ILLEGAL_REQUEST:
		if (cmd[0] == ALLOW_MEDIUM_REMOVAL)

drivers/scsi/scsi_lib.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -911,7 +911,7 @@ static void scsi_io_completion_action(struct scsi_cmnd *cmd, int result)
		*/
		if (!level && __ratelimit(&_rs)) {
		scsi_print_result(cmd, NULL, FAILED);
		if (driver_byte(result) & DRIVER_SENSE)
		if (driver_byte(result) == DRIVER_SENSE)
		scsi_print_sense(cmd);
		scsi_print_command(cmd);
		}
		@@ -2605,7 +2605,7 @@ scsi_mode_sense(struct scsi_device *sdev, int dbd, int modepage,
		* ILLEGAL REQUEST if the code page isn't supported */

		if (use_10_for_ms && !scsi_status_is_good(result) &&
		(driver_byte(result) & DRIVER_SENSE)) {
		driver_byte(result) == DRIVER_SENSE) {
		if (scsi_sense_valid(sshdr)) {
		if ((sshdr->sense_key == ILLEGAL_REQUEST) &&
		(sshdr->asc == 0x20) && (sshdr->ascq == 0)) {