aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/blkdev.h
diff options
context:
space:
mode:
authorMartin K. Petersen <martin.petersen@oracle.com>2009-05-22 17:17:51 -0400
committerJens Axboe <jens.axboe@oracle.com>2009-05-22 17:22:55 -0400
commit025146e13b63483add912706c101fb0fb6f015cc (patch)
tree42d2d42e2222f0a2d6373a0ddf0cbf733f75dcba /include/linux/blkdev.h
parentae03bf639a5027d27270123f5f6e3ee6a412781d (diff)
block: Move queue limits to an embedded struct
To accommodate stacking drivers that do not have an associated request queue we're moving the limits to a separate, embedded structure. Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com> Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Diffstat (limited to 'include/linux/blkdev.h')
-rw-r--r--include/linux/blkdev.h44
1 files changed, 26 insertions, 18 deletions
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index 29b48f7b4ba8..b7bb6fdba12c 100644
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -307,6 +307,21 @@ struct blk_cmd_filter {
307 struct kobject kobj; 307 struct kobject kobj;
308}; 308};
309 309
310struct queue_limits {
311 unsigned long bounce_pfn;
312 unsigned long seg_boundary_mask;
313
314 unsigned int max_hw_sectors;
315 unsigned int max_sectors;
316 unsigned int max_segment_size;
317
318 unsigned short logical_block_size;
319 unsigned short max_hw_segments;
320 unsigned short max_phys_segments;
321
322 unsigned char no_cluster;
323};
324
310struct request_queue 325struct request_queue
311{ 326{
312 /* 327 /*
@@ -358,7 +373,6 @@ struct request_queue
358 /* 373 /*
359 * queue needs bounce pages for pages above this limit 374 * queue needs bounce pages for pages above this limit
360 */ 375 */
361 unsigned long bounce_pfn;
362 gfp_t bounce_gfp; 376 gfp_t bounce_gfp;
363 377
364 /* 378 /*
@@ -387,14 +401,6 @@ struct request_queue
387 unsigned int nr_congestion_off; 401 unsigned int nr_congestion_off;
388 unsigned int nr_batching; 402 unsigned int nr_batching;
389 403
390 unsigned int max_sectors;
391 unsigned int max_hw_sectors;
392 unsigned short max_phys_segments;
393 unsigned short max_hw_segments;
394 unsigned short logical_block_size;
395 unsigned int max_segment_size;
396
397 unsigned long seg_boundary_mask;
398 void *dma_drain_buffer; 404 void *dma_drain_buffer;
399 unsigned int dma_drain_size; 405 unsigned int dma_drain_size;
400 unsigned int dma_pad_mask; 406 unsigned int dma_pad_mask;
@@ -410,6 +416,8 @@ struct request_queue
410 struct timer_list timeout; 416 struct timer_list timeout;
411 struct list_head timeout_list; 417 struct list_head timeout_list;
412 418
419 struct queue_limits limits;
420
413 /* 421 /*
414 * sg stuff 422 * sg stuff
415 */ 423 */
@@ -991,45 +999,45 @@ extern void blk_set_cmd_filter_defaults(struct blk_cmd_filter *filter);
991 999
992static inline unsigned long queue_bounce_pfn(struct request_queue *q) 1000static inline unsigned long queue_bounce_pfn(struct request_queue *q)
993{ 1001{
994 return q->bounce_pfn; 1002 return q->limits.bounce_pfn;
995} 1003}
996 1004
997static inline unsigned long queue_segment_boundary(struct request_queue *q) 1005static inline unsigned long queue_segment_boundary(struct request_queue *q)
998{ 1006{
999 return q->seg_boundary_mask; 1007 return q->limits.seg_boundary_mask;
1000} 1008}
1001 1009
1002static inline unsigned int queue_max_sectors(struct request_queue *q) 1010static inline unsigned int queue_max_sectors(struct request_queue *q)
1003{ 1011{
1004 return q->max_sectors; 1012 return q->limits.max_sectors;
1005} 1013}
1006 1014
1007static inline unsigned int queue_max_hw_sectors(struct request_queue *q) 1015static inline unsigned int queue_max_hw_sectors(struct request_queue *q)
1008{ 1016{
1009 return q->max_hw_sectors; 1017 return q->limits.max_hw_sectors;
1010} 1018}
1011 1019
1012static inline unsigned short queue_max_hw_segments(struct request_queue *q) 1020static inline unsigned short queue_max_hw_segments(struct request_queue *q)
1013{ 1021{
1014 return q->max_hw_segments; 1022 return q->limits.max_hw_segments;
1015} 1023}
1016 1024
1017static inline unsigned short queue_max_phys_segments(struct request_queue *q) 1025static inline unsigned short queue_max_phys_segments(struct request_queue *q)
1018{ 1026{
1019 return q->max_phys_segments; 1027 return q->limits.max_phys_segments;
1020} 1028}
1021 1029
1022static inline unsigned int queue_max_segment_size(struct request_queue *q) 1030static inline unsigned int queue_max_segment_size(struct request_queue *q)
1023{ 1031{
1024 return q->max_segment_size; 1032 return q->limits.max_segment_size;
1025} 1033}
1026 1034
1027static inline unsigned short queue_logical_block_size(struct request_queue *q) 1035static inline unsigned short queue_logical_block_size(struct request_queue *q)
1028{ 1036{
1029 int retval = 512; 1037 int retval = 512;
1030 1038
1031 if (q && q->logical_block_size) 1039 if (q && q->limits.logical_block_size)
1032 retval = q->logical_block_size; 1040 retval = q->limits.logical_block_size;
1033 1041
1034 return retval; 1042 return retval;
1035} 1043}