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

Commit d227ec26 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Martin K. Petersen
Browse files

scsi: sd: Cleanup sd_done sense data handling 



Use a switch for the sense key, and remove two pointless variables that
are only used once.

[mkp: Added UNMAP comment and removed good_bytes based on comment from
Damien]

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 6eadc612

drivers/scsi/sd.c

+9 −10
Original line number Diff line number Diff line
@@ -1815,8 +1815,6 @@ static int sd_done(struct scsi_cmnd *SCpnt) 
	struct request *req = SCpnt->request;

	int sense_valid = 0;

	int sense_deferred = 0;

	unsigned char op = SCpnt->cmnd[0];

	unsigned char unmap = SCpnt->cmnd[1] & 8;



	switch (req_op(req)) {

	case REQ_OP_DISCARD:
@@ -1874,26 +1872,27 @@ static int sd_done(struct scsi_cmnd *SCpnt) 
			good_bytes = sd_completed_bytes(SCpnt);

		break;

	case ILLEGAL_REQUEST:

		if (sshdr.asc == 0x10)  /* DIX: Host detected corruption */

		switch (sshdr.asc) {

		case 0x10:	/* DIX: Host detected corruption */

			good_bytes = sd_completed_bytes(SCpnt);

		/* INVALID COMMAND OPCODE or INVALID FIELD IN CDB */

		if (sshdr.asc == 0x20 || sshdr.asc == 0x24) {

			switch (op) {

			break;

		case 0x20:	/* INVALID COMMAND OPCODE */

		case 0x24:	/* INVALID FIELD IN CDB */

			switch (SCpnt->cmnd[0]) {

			case UNMAP:

				sd_config_discard(sdkp, SD_LBP_DISABLE);

				break;

			case WRITE_SAME_16:

			case WRITE_SAME:

				if (unmap)

				if (SCpnt->cmnd[1] & 8) { /* UNMAP */

					sd_config_discard(sdkp, SD_LBP_DISABLE);

				else {

				} else {

					sdkp->device->no_write_same = 1;

					sd_config_write_same(sdkp);



					good_bytes = 0;

					req->__data_len = blk_rq_bytes(req);

					req->rq_flags |= RQF_QUIET;

				}

				break;

			}

		}

		break;