From: Andrew Morton s/sector_size/max_sectors/ Cc: Mike Miller Cc: Jens Axboe Signed-off-by: Andrew Morton --- drivers/block/cciss.c | 10 +++++----- drivers/block/cciss.h | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff -puN drivers/block/cciss.c~cciss-set-sector_size-to-2048-for-performance-tidy drivers/block/cciss.c --- a/drivers/block/cciss.c~cciss-set-sector_size-to-2048-for-performance-tidy +++ a/drivers/block/cciss.c @@ -269,7 +269,7 @@ static int cciss_proc_get_info(char *buf "Firmware Version: %c%c%c%c\n" "IRQ: %d\n" "Logical drives: %d\n" - "Sector size: %d\n" + "Max sectors: %d\n" "Current Q depth: %d\n" "Current # commands on controller: %d\n" "Max Q depth since init: %d\n" @@ -281,7 +281,7 @@ static int cciss_proc_get_info(char *buf h->firm_ver[0], h->firm_ver[1], h->firm_ver[2], h->firm_ver[3], (unsigned int)h->intr[SIMPLE_MODE_INT], h->num_luns, - h->cciss_sector_size, + h->cciss_max_sectors, h->Qdepth, h->commands_outstanding, h->maxQsinceinit, h->max_outstanding, h->maxSG); @@ -1398,7 +1398,7 @@ static void cciss_update_drive_info(int /* This is a limit in the driver and could be eliminated. */ blk_queue_max_phys_segments(disk->queue, MAXSGENTRIES); - blk_queue_max_sectors(disk->queue, h->cciss_sector_size); + blk_queue_max_sectors(disk->queue, h->cciss_max_sectors); blk_queue_softirq_done(disk->queue, cciss_softirq_done); @@ -3351,7 +3351,7 @@ static int __devinit cciss_init_one(stru cciss_procinit(i); - hba[i]->cciss_sector_size = 2048; + hba[i]->cciss_max_sectors = 2048; hba[i]->busy_initializing = 0; @@ -3377,7 +3377,7 @@ static int __devinit cciss_init_one(stru /* This is a limit in the driver and could be eliminated. */ blk_queue_max_phys_segments(q, MAXSGENTRIES); - blk_queue_max_sectors(q, hba[i]->cciss_sector_size); + blk_queue_max_sectors(q, hba[i]->cciss_max_sectors); blk_queue_softirq_done(q, cciss_softirq_done); diff -puN drivers/block/cciss.h~cciss-set-sector_size-to-2048-for-performance-tidy drivers/block/cciss.h --- a/drivers/block/cciss.h~cciss-set-sector_size-to-2048-for-performance-tidy +++ a/drivers/block/cciss.h @@ -77,7 +77,7 @@ struct ctlr_info unsigned int intr[4]; unsigned int msix_vector; unsigned int msi_vector; - int cciss_sector_size; + int cciss_max_sectors; BYTE cciss_read; BYTE cciss_write; BYTE cciss_read_capacity; _