UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

scsi: sd_zbc: Fix sd_zbc_complete() 

The ILLEGAL REQUEST/INVALID FIELD IN CDB error generated by an attempt to
reset a conventional zone does not apply to the reset write pointer command
with the ALL bit set, that is, to REQ_OP_ZONE_RESET_ALL requests. Fix
sd_zbc_complete() to be quiet only in the case of REQ_OP_ZONE_RESET,
excluding REQ_OP_ZONE_RESET_ALL.

Since REQ_OP_ZONE_RESET is the only request handled by sd_zbc_complete(),
also simplify the code using a simple if statement.

[mkp: applied by hand]

Fixes: d81e9d4943 ("scsi: implement REQ_OP_ZONE_RESET_ALL")
Cc: stable@vger.kernel.org
Link: https://lore.kernel.org/r/20191027140549.26272-4-damien.lemoal@wdc.com
Signed-off-by: Damien Le Moal <damien.lemoal@wdc.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
This commit is contained in:
Damien Le Moal 2019-10-27 23:05:44 +09:00 committed by Martin K. Petersen
parent da0c9ea146
commit edc1f5432f
1 changed files with 10 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
drivers/scsi/sd_zbc.c
View File

@ -263,25 +263,16 @@ void sd_zbc_complete(struct scsi_cmnd *cmd, unsigned int good_bytes,
int result = cmd->result; int result = cmd->result;
struct request *rq = cmd->request; struct request *rq = cmd->request;
switch (req_op(rq)) { if (req_op(rq) == REQ_OP_ZONE_RESET &&
case REQ_OP_ZONE_RESET: result &&
case REQ_OP_ZONE_RESET_ALL: sshdr->sense_key == ILLEGAL_REQUEST &&
sshdr->asc == 0x24) {
if (result && /*
sshdr->sense_key == ILLEGAL_REQUEST && * INVALID FIELD IN CDB error: reset of a conventional
sshdr->asc == 0x24) * zone was attempted. Nothing to worry about, so be
/* * quiet about the error.
* INVALID FIELD IN CDB error: reset of a conventional */
* zone was attempted. Nothing to worry about, so be rq->rq_flags |= RQF_QUIET;
* quiet about the error.
*/
rq->rq_flags |= RQF_QUIET;
break;
case REQ_OP_WRITE:
case REQ_OP_WRITE_ZEROES:
case REQ_OP_WRITE_SAME:
break;
} }
} }