From: John Garry Date: Mon, 5 Aug 2024 11:33:14 +0000 (+0000) Subject: scsi: sd: Don't check if a write for REQ_ATOMIC X-Git-Tag: v6.12-rc1~124^2~21 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0c150b30d3d51a8c2e09fadd004a640fa12985c6;p=thirdparty%2Fkernel%2Flinux.git scsi: sd: Don't check if a write for REQ_ATOMIC Flag REQ_ATOMIC can only be set for writes, so don't check if the operation is also a write in sd_setup_read_write_cmnd(). Fixes: bf4ae8f2e640 ("scsi: sd: Atomic write support") Signed-off-by: John Garry Link: https://lore.kernel.org/r/20240805113315.1048591-2-john.g.garry@oracle.com Reviewed-by: Kanchan Joshi Signed-off-by: Martin K. Petersen --- diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c index adeaa8ab99516..e90a2e4ab3182 100644 --- a/drivers/scsi/sd.c +++ b/drivers/scsi/sd.c @@ -1382,7 +1382,7 @@ static blk_status_t sd_setup_read_write_cmnd(struct scsi_cmnd *cmd) if (protect && sdkp->protection_type == T10_PI_TYPE2_PROTECTION) { ret = sd_setup_rw32_cmnd(cmd, write, lba, nr_blocks, protect | fua, dld); - } else if (rq->cmd_flags & REQ_ATOMIC && write) { + } else if (rq->cmd_flags & REQ_ATOMIC) { ret = sd_setup_atomic_cmnd(cmd, lba, nr_blocks, sdkp->use_atomic_write_boundary, protect | fua);