summaryrefslogtreecommitdiff
path: root/drivers/scsi/sd.c
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2014-07-18 14:59:19 (GMT)
committerChristoph Hellwig <hch@lst.de>2014-07-25 21:16:41 (GMT)
commitfd2eb9034e48cdca358dc06a833a736e7c6f68dd (patch)
tree18366ad7112141752ca2ab95ec7fd07a9a23f9a3 /drivers/scsi/sd.c
parent7a14c1c3319608154da8712e4174d56ffb2f7b8d (diff)
downloadlinux-fd2eb9034e48cdca358dc06a833a736e7c6f68dd.tar.xz
scsi: move the writeable field from struct scsi_device to struct scsi_cd
We currently set the field in common code based on the device type, but then only use it in the cdrom driver which also overrides the value previously set in the generic code. Just leave this entirely to the CDROM driver to make everyones life simpler. Signed-off-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Hannes Reinecke <hare@suse.de> Reviewed-by: Martin K. Petersen <martin.petersen@oracle.com>
Diffstat (limited to 'drivers/scsi/sd.c')
-rw-r--r--drivers/scsi/sd.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index 3663e38..377a520 100644
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -992,9 +992,6 @@ static int sd_setup_read_write_cmnd(struct scsi_cmnd *SCpnt)
}
}
if (rq_data_dir(rq) == WRITE) {
- if (!sdp->writeable) {
- goto out;
- }
SCpnt->cmnd[0] = WRITE_6;
if (blk_integrity_rq(rq))