]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
scsi: sd: Fix wrong DPOFUA disable in sd_read_cache_type
authorDamien Le Moal <damien.lemoal@wdc.com>
Thu, 12 Jan 2017 06:25:10 +0000 (15:25 +0900)
committerMartin K. Petersen <martin.petersen@oracle.com>
Tue, 17 Jan 2017 19:05:02 +0000 (14:05 -0500)
Zoned block devices force the use of READ/WRITE(16) commands by setting
sdkp->use_16_for_rw and clearing sdkp->use_10_for_rw. This result in
DPOFUA always being disabled for these drives as the assumed use of
the deprecated READ/WRITE(6) commands only looks at sdkp->use_10_for_rw.
Strenghten the test by also checking that sdkp->use_16_for_rw is false.

Signed-off-by: Damien Le Moal <damien.lemoal@wdc.com>
Reviewed-by: Hannes Reinecke <hare@suse.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
drivers/scsi/sd.c

index 1622e23138e0f430d77fe7db10c840941ef02aef..28713d36050e4ac84f000da6a020d1e8fa19ccb1 100644 (file)
@@ -2600,7 +2600,8 @@ sd_read_cache_type(struct scsi_disk *sdkp, unsigned char *buffer)
                if (sdp->broken_fua) {
                        sd_first_printk(KERN_NOTICE, sdkp, "Disabling FUA\n");
                        sdkp->DPOFUA = 0;
-               } else if (sdkp->DPOFUA && !sdkp->device->use_10_for_rw) {
+               } else if (sdkp->DPOFUA && !sdkp->device->use_10_for_rw &&
+                          !sdkp->device->use_16_for_rw) {
                        sd_first_printk(KERN_NOTICE, sdkp,
                                  "Uses READ/WRITE(6), disabling FUA\n");
                        sdkp->DPOFUA = 0;