[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>

1 files changed, 7 insertions, 6 deletions

diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index 152f4ff4ed7e..f6a452846fab 100644
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -1467,7 +1467,6 @@ sd_read_cache_type(struct scsi_disk *sdkp, char *diskname,
         res = sd_do_mode_sense(sdp, dbd, modepage, buffer, len, &data, &sshdr);
 
         if (scsi_status_is_good(res)) {
-                int ct = 0;
                 int offset = data.header_length + data.block_descriptor_length;
 
                 if (offset >= SD_BUF_SIZE - 2) {
@@ -1496,11 +1495,13 @@ sd_read_cache_type(struct scsi_disk *sdkp, char *diskname,
                         sdkp->DPOFUA = 0;
                 }
 
-                ct =  sdkp->RCD + 2*sdkp->WCE;
-
-                printk(KERN_NOTICE "SCSI device %s: drive cache: %s%s\n",
-                       diskname, sd_cache_types[ct],
-                       sdkp->DPOFUA ? " w/ FUA" : "");
+                printk(KERN_NOTICE "SCSI device %s: "
+                       "write cache: %s, read cache: %s, %s\n",
+                       diskname,
+                       sdkp->WCE ? "enabled" : "disabled",
+                       sdkp->RCD ? "disabled" : "enabled",
+                       sdkp->DPOFUA ? "supports DPO and FUA"
+                       : "doesn't support DPO or FUA");
 
                 return;
         }