aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi
diff options
context:
space:
mode:
authorJens Axboe <jens.axboe@oracle.com>2006-12-19 02:27:31 -0500
committerJens Axboe <jens.axboe@oracle.com>2006-12-19 02:27:31 -0500
commit2985259b0e3928d4cd0723ac5aad0d1190ab7717 (patch)
tree70d1d7801699102d3bb52bc84b8ec8f4fc371c06 /drivers/scsi
parenta52de245ef0b6217a56fb2472ff65c3a196cafd5 (diff)
[PATCH] ->nr_sectors and ->hard_nr_sectors are not used for BLOCK_PC requests
It's a file system thing, for block requests the only size used in the io paths is ->data_len as it is in bytes, not sectors. Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Diffstat (limited to 'drivers/scsi')
-rw-r--r--drivers/scsi/scsi_lib.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
index 1748e27501cd..41a2ea32a300 100644
--- a/drivers/scsi/scsi_lib.c
+++ b/drivers/scsi/scsi_lib.c
@@ -270,8 +270,6 @@ static int scsi_merge_bio(struct request *rq, struct bio *bio)
270 else { 270 else {
271 rq->biotail->bi_next = bio; 271 rq->biotail->bi_next = bio;
272 rq->biotail = bio; 272 rq->biotail = bio;
273 rq->hard_nr_sectors += bio_sectors(bio);
274 rq->nr_sectors = rq->hard_nr_sectors;
275 } 273 }
276 274
277 return 0; 275 return 0;