From 9d399e3644d1cc8f6537b0d15141ec9f15169d7e Mon Sep 17 00:00:00 2001 From: Namjae Jeon Date: Sat, 7 Jul 2012 23:05:08 -0400 Subject: [PATCH] --- yaml --- r: 316830 b: refs/heads/master c: b81478d82e389dd0961760f5ff6f56b50d29db6d h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/scsi/sd.c | 9 +++++++-- trunk/include/scsi/scsi_device.h | 1 + 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 1fdf72e31881..7ac9f1312c92 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 365a7150094114a0f8ef0b6164e6b04b519039e8 +refs/heads/master: b81478d82e389dd0961760f5ff6f56b50d29db6d diff --git a/trunk/drivers/scsi/sd.c b/trunk/drivers/scsi/sd.c index 6e26db11250a..4df73e52a4f9 100644 --- a/trunk/drivers/scsi/sd.c +++ b/trunk/drivers/scsi/sd.c @@ -2261,8 +2261,13 @@ sd_read_cache_type(struct scsi_disk *sdkp, unsigned char *buffer) sd_printk(KERN_ERR, sdkp, "Asking for cache data failed\n"); defaults: - sd_printk(KERN_ERR, sdkp, "Assuming drive cache: write through\n"); - sdkp->WCE = 0; + if (sdp->wce_default_on) { + sd_printk(KERN_NOTICE, sdkp, "Assuming drive cache: write back\n"); + sdkp->WCE = 1; + } else { + sd_printk(KERN_ERR, sdkp, "Assuming drive cache: write through\n"); + sdkp->WCE = 0; + } sdkp->RCD = 0; sdkp->DPOFUA = 0; } diff --git a/trunk/include/scsi/scsi_device.h b/trunk/include/scsi/scsi_device.h index bd1a14d89009..7539f52a33c9 100644 --- a/trunk/include/scsi/scsi_device.h +++ b/trunk/include/scsi/scsi_device.h @@ -154,6 +154,7 @@ struct scsi_device { unsigned no_read_capacity_16:1; /* Avoid READ_CAPACITY_16 cmds */ unsigned try_rc_10_first:1; /* Try READ_CAPACACITY_10 first */ unsigned is_visible:1; /* is the device visible in sysfs */ + unsigned wce_default_on:1; /* Cache is ON by default */ DECLARE_BITMAP(supported_events, SDEV_EVT_MAXBITS); /* supported events */ struct list_head event_list; /* asserted events */