Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

[SCSI] sd: clearer output of disk cache state

Signed-off-by: Luben Tuikov <ltuikov@yahoo.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

authored by

Luben Tuikov and committed by
James Bottomley
fd44bab5 4f777ed2

+7 -6
+7 -6
drivers/scsi/sd.c
··· 1467 1467 res = sd_do_mode_sense(sdp, dbd, modepage, buffer, len, &data, &sshdr); 1468 1468 1469 1469 if (scsi_status_is_good(res)) { 1470 - int ct = 0; 1471 1470 int offset = data.header_length + data.block_descriptor_length; 1472 1471 1473 1472 if (offset >= SD_BUF_SIZE - 2) { ··· 1495 1496 sdkp->DPOFUA = 0; 1496 1497 } 1497 1498 1498 - ct = sdkp->RCD + 2*sdkp->WCE; 1499 - 1500 - printk(KERN_NOTICE "SCSI device %s: drive cache: %s%s\n", 1501 - diskname, sd_cache_types[ct], 1502 - sdkp->DPOFUA ? " w/ FUA" : ""); 1499 + printk(KERN_NOTICE "SCSI device %s: " 1500 + "write cache: %s, read cache: %s, %s\n", 1501 + diskname, 1502 + sdkp->WCE ? "enabled" : "disabled", 1503 + sdkp->RCD ? "disabled" : "enabled", 1504 + sdkp->DPOFUA ? "supports DPO and FUA" 1505 + : "doesn't support DPO or FUA"); 1503 1506 1504 1507 return; 1505 1508 }