diff options
| author | Ben Hutchings <ben@decadent.org.uk> | 2013-05-27 19:07:19 +0100 |
|---|---|---|
| committer | James Bottomley <JBottomley@Parallels.com> | 2013-06-26 08:44:33 -0700 |
| commit | 2ee3e26c673e75c05ef8b914f54fadee3d7b9c88 (patch) | |
| tree | 3412049f8c10d4a29c8dbd6a395609d677410e8e /drivers/scsi/sd.c | |
| parent | c6e23d83c35380909edf2eb364943719bc10e9be (diff) | |
| download | blackbird-op-linux-2ee3e26c673e75c05ef8b914f54fadee3d7b9c88.tar.gz blackbird-op-linux-2ee3e26c673e75c05ef8b914f54fadee3d7b9c88.zip | |
[SCSI] sd: Fix parsing of 'temporary ' cache mode prefix
Commit 39c60a0948cc '[SCSI] sd: fix array cache flushing bug causing
performance problems' added temp as a pointer to "temporary " and used
sizeof(temp) - 1 as its length. But sizeof(temp) is the size of the
pointer, not the size of the string constant. Change temp to a static
array so that sizeof() does what was intended.
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Cc: stable@vger.kernel.org
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
Diffstat (limited to 'drivers/scsi/sd.c')
| -rw-r--r-- | drivers/scsi/sd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c index a37eda9f11f5..91e8a953d1de 100644 --- a/drivers/scsi/sd.c +++ b/drivers/scsi/sd.c @@ -142,7 +142,7 @@ sd_store_cache_type(struct device *dev, struct device_attribute *attr, char *buffer_data; struct scsi_mode_data data; struct scsi_sense_hdr sshdr; - const char *temp = "temporary "; + static const char temp[] = "temporary "; int len; if (sdp->type != TYPE_DISK) |
