aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/block/cciss.c
diff options
context:
space:
mode:
authorMartin K. Petersen <martin.petersen@oracle.com>2009-05-22 17:17:49 -0400
committerJens Axboe <jens.axboe@oracle.com>2009-05-22 17:22:54 -0400
commite1defc4ff0cf57aca6c5e3ff99fa503f5943c1f1 (patch)
treed60d15a082171c58ac811d547d51a9c3119f23e3 /drivers/block/cciss.c
parent9bd7de51ee8537094656149eaf45338cadb7d7d4 (diff)
block: Do away with the notion of hardsect_size
Until now we have had a 1:1 mapping between storage device physical block size and the logical block sized used when addressing the device. With SATA 4KB drives coming out that will no longer be the case. The sector size will be 4KB but the logical block size will remain 512-bytes. Hence we need to distinguish between the physical block size and the logical ditto. This patch renames hardsect_size to logical_block_size. Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com> Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Diffstat (limited to 'drivers/block/cciss.c')
-rw-r--r--drivers/block/cciss.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
index e714e7cce6f2..94474f5f8bce 100644
--- a/drivers/block/cciss.c
+++ b/drivers/block/cciss.c
@@ -1389,8 +1389,8 @@ static void cciss_add_disk(ctlr_info_t *h, struct gendisk *disk,
1389 1389
1390 disk->queue->queuedata = h; 1390 disk->queue->queuedata = h;
1391 1391
1392 blk_queue_hardsect_size(disk->queue, 1392 blk_queue_logical_block_size(disk->queue,
1393 h->drv[drv_index].block_size); 1393 h->drv[drv_index].block_size);
1394 1394
1395 /* Make sure all queue data is written out before */ 1395 /* Make sure all queue data is written out before */
1396 /* setting h->drv[drv_index].queue, as setting this */ 1396 /* setting h->drv[drv_index].queue, as setting this */
@@ -2298,7 +2298,7 @@ static int cciss_revalidate(struct gendisk *disk)
2298 cciss_geometry_inquiry(h->ctlr, logvol, 1, total_size, block_size, 2298 cciss_geometry_inquiry(h->ctlr, logvol, 1, total_size, block_size,
2299 inq_buff, drv); 2299 inq_buff, drv);
2300 2300
2301 blk_queue_hardsect_size(drv->queue, drv->block_size); 2301 blk_queue_logical_block_size(drv->queue, drv->block_size);
2302 set_capacity(disk, drv->nr_blocks); 2302 set_capacity(disk, drv->nr_blocks);
2303 2303
2304 kfree(inq_buff); 2304 kfree(inq_buff);