From 342cbc529806de2d0c859f37a4c4c6702f279d85 Mon Sep 17 00:00:00 2001 From: "Jason J. Herne" Date: Wed, 14 Nov 2012 17:03:22 -0500 Subject: [PATCH] --- yaml --- r: 343727 b: refs/heads/master c: 53ad570be625045aba3ae7de8d82401364c655e1 h: refs/heads/master i: 343725: 4985791b976033c8ddd6902ddf64aeef874b1248 343723: 2204391127f6b71c5c5c5185df25b6c44667f36a 343719: d7ac7e0275b8e4626c4a2f7c7fe3ac15aab10348 343711: 3a92176acd750c210d7d14275db9368faaba7733 v: v3 --- [refs] | 2 +- trunk/drivers/scsi/sd.c | 4 +++- trunk/include/scsi/scsi_device.h | 1 + 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 6f9d2f1a4a18..1de42be54317 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0b4334473d48aa18e8448f9f718f1dcd0398c550 +refs/heads/master: 53ad570be625045aba3ae7de8d82401364c655e1 diff --git a/trunk/drivers/scsi/sd.c b/trunk/drivers/scsi/sd.c index a45e12ac7e28..c5a189c50286 100644 --- a/trunk/drivers/scsi/sd.c +++ b/trunk/drivers/scsi/sd.c @@ -1011,7 +1011,7 @@ static int sd_prep_fn(struct request_queue *q, struct request *rq) SCpnt->cmnd[29] = (unsigned char) (this_count >> 16) & 0xff; SCpnt->cmnd[30] = (unsigned char) (this_count >> 8) & 0xff; SCpnt->cmnd[31] = (unsigned char) this_count & 0xff; - } else if (block > 0xffffffff) { + } else if (sdp->use_16_for_rw) { SCpnt->cmnd[0] += READ_16 - READ_6; SCpnt->cmnd[1] = protect | ((rq->cmd_flags & REQ_FUA) ? 0x8 : 0); SCpnt->cmnd[2] = sizeof(block) > 4 ? (unsigned char) (block >> 56) & 0xff : 0; @@ -2203,6 +2203,8 @@ sd_read_capacity(struct scsi_disk *sdkp, unsigned char *buffer) } } + sdp->use_16_for_rw = (sdkp->capacity > 0xffffffff); + /* Rescale capacity to 512-byte units */ if (sector_size == 4096) sdkp->capacity <<= 3; diff --git a/trunk/include/scsi/scsi_device.h b/trunk/include/scsi/scsi_device.h index 55367b04dc94..e65c62e82c5a 100644 --- a/trunk/include/scsi/scsi_device.h +++ b/trunk/include/scsi/scsi_device.h @@ -137,6 +137,7 @@ struct scsi_device { unsigned use_10_for_ms:1; /* first try 10-byte mode sense/select */ unsigned no_report_opcodes:1; /* no REPORT SUPPORTED OPERATION CODES */ unsigned no_write_same:1; /* no WRITE SAME command */ + unsigned use_16_for_rw:1; /* Use read/write(16) over read/write(10) */ unsigned skip_ms_page_8:1; /* do not use MODE SENSE page 0x08 */ unsigned skip_ms_page_3f:1; /* do not use MODE SENSE page 0x3f */ unsigned skip_vpd_pages:1; /* do not read VPD pages */