]>
Commit | Line | Data |
---|---|---|
d476d390 GKH |
1 | From 892b6f90db81cccb723d5d92f4fddc2d68b206e1 Mon Sep 17 00:00:00 2001 |
2 | From: Martin K. Petersen <martin.petersen@oracle.com> | |
3 | Date: Wed, 13 Oct 2010 21:18:03 +0200 | |
4 | Subject: block: Ensure physical block size is unsigned int | |
5 | ||
6 | From: Martin K. Petersen <martin.petersen@oracle.com> | |
7 | ||
8 | commit 892b6f90db81cccb723d5d92f4fddc2d68b206e1 upstream. | |
9 | ||
10 | Physical block size was declared unsigned int to accomodate the maximum | |
11 | size reported by READ CAPACITY(16). Make sure we use the right type in | |
12 | the related functions. | |
13 | ||
14 | Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com> | |
15 | Acked-by: Mike Snitzer <snitzer@redhat.com> | |
16 | Signed-off-by: Jens Axboe <jaxboe@fusionio.com> | |
17 | Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> | |
18 | ||
19 | --- | |
20 | block/blk-settings.c | 2 +- | |
21 | include/linux/blkdev.h | 4 ++-- | |
22 | 2 files changed, 3 insertions(+), 3 deletions(-) | |
23 | ||
24 | --- a/block/blk-settings.c | |
25 | +++ b/block/blk-settings.c | |
26 | @@ -343,7 +343,7 @@ EXPORT_SYMBOL(blk_queue_logical_block_si | |
27 | * hardware can operate on without reverting to read-modify-write | |
28 | * operations. | |
29 | */ | |
30 | -void blk_queue_physical_block_size(struct request_queue *q, unsigned short size) | |
31 | +void blk_queue_physical_block_size(struct request_queue *q, unsigned int size) | |
32 | { | |
33 | q->limits.physical_block_size = size; | |
34 | ||
35 | --- a/include/linux/blkdev.h | |
36 | +++ b/include/linux/blkdev.h | |
37 | @@ -851,7 +851,7 @@ extern void blk_queue_max_segment_size(s | |
38 | extern void blk_queue_max_discard_sectors(struct request_queue *q, | |
39 | unsigned int max_discard_sectors); | |
40 | extern void blk_queue_logical_block_size(struct request_queue *, unsigned short); | |
41 | -extern void blk_queue_physical_block_size(struct request_queue *, unsigned short); | |
42 | +extern void blk_queue_physical_block_size(struct request_queue *, unsigned int); | |
43 | extern void blk_queue_alignment_offset(struct request_queue *q, | |
44 | unsigned int alignment); | |
45 | extern void blk_limits_io_min(struct queue_limits *limits, unsigned int min); | |
46 | @@ -1004,7 +1004,7 @@ static inline unsigned int queue_physica | |
47 | return q->limits.physical_block_size; | |
48 | } | |
49 | ||
50 | -static inline int bdev_physical_block_size(struct block_device *bdev) | |
51 | +static inline unsigned int bdev_physical_block_size(struct block_device *bdev) | |
52 | { | |
53 | return queue_physical_block_size(bdev_get_queue(bdev)); | |
54 | } |