aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin K. Petersen2010-02-25 23:20:37 -0600
committerJens Axboe2010-02-26 06:58:08 -0600
commiteb28d31bc97e6374d81f404da309401ffaed467b (patch)
tree580d750832dd1da39a5c93b91b8e069db3395b1c /block/blk-settings.c
parente751e76a5f7adeee7438e68b0965559ad2864d0d (diff)
downloadkernel-common-eb28d31bc97e6374d81f404da309401ffaed467b.tar.gz
kernel-common-eb28d31bc97e6374d81f404da309401ffaed467b.tar.xz
kernel-common-eb28d31bc97e6374d81f404da309401ffaed467b.zip
block: Add BLK_ prefix to definitions
Add a BLK_ prefix to block layer constants. Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com> Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Diffstat (limited to 'block/blk-settings.c')
-rw-r--r--block/blk-settings.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/block/blk-settings.c b/block/blk-settings.c
index 4db46f2fcbe..3c53b0beb8d 100644
--- a/block/blk-settings.c
+++ b/block/blk-settings.c
@@ -94,7 +94,7 @@ void blk_set_default_limits(struct queue_limits *lim)
94 lim->max_phys_segments = MAX_PHYS_SEGMENTS; 94 lim->max_phys_segments = MAX_PHYS_SEGMENTS;
95 lim->max_hw_segments = MAX_HW_SEGMENTS; 95 lim->max_hw_segments = MAX_HW_SEGMENTS;
96 lim->seg_boundary_mask = BLK_SEG_BOUNDARY_MASK; 96 lim->seg_boundary_mask = BLK_SEG_BOUNDARY_MASK;
97 lim->max_segment_size = MAX_SEGMENT_SIZE; 97 lim->max_segment_size = BLK_MAX_SEGMENT_SIZE;
98 lim->max_sectors = BLK_DEF_MAX_SECTORS; 98 lim->max_sectors = BLK_DEF_MAX_SECTORS;
99 lim->max_hw_sectors = INT_MAX; 99 lim->max_hw_sectors = INT_MAX;
100 lim->max_discard_sectors = 0; 100 lim->max_discard_sectors = 0;
@@ -154,7 +154,7 @@ void blk_queue_make_request(struct request_queue *q, make_request_fn *mfn)
154 q->unplug_timer.data = (unsigned long)q; 154 q->unplug_timer.data = (unsigned long)q;
155 155
156 blk_set_default_limits(&q->limits); 156 blk_set_default_limits(&q->limits);
157 blk_queue_max_sectors(q, SAFE_MAX_SECTORS); 157 blk_queue_max_sectors(q, BLK_SAFE_MAX_SECTORS);
158 158
159 /* 159 /*
160 * If the caller didn't supply a lock, fall back to our embedded 160 * If the caller didn't supply a lock, fall back to our embedded