Commit 892b6f90 authored by Martin K. Petersen's avatar Martin K. Petersen Committed by Jens Axboe
Browse files

block: Ensure physical block size is unsigned int 



Physical block size was declared unsigned int to accomodate the maximum
size reported by READ CAPACITY(16).  Make sure we use the right type in
the related functions.

Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
Acked-by: default avatarMike Snitzer <snitzer@redhat.com>
Cc: stable@kernel.org
Signed-off-by: default avatarJens Axboe <jaxboe@fusionio.com>
parent c49c06e4

block/blk-settings.c

+1 −1
Original line number Diff line number Diff line
@@ -344,7 +344,7 @@ EXPORT_SYMBOL(blk_queue_logical_block_size); 
 *   hardware can operate on without reverting to read-modify-write

 *   operations.

 */

void blk_queue_physical_block_size(struct request_queue *q, unsigned short size)

void blk_queue_physical_block_size(struct request_queue *q, unsigned int size)

{

	q->limits.physical_block_size = size;

include/linux/blkdev.h

+2 −2
Original line number Diff line number Diff line
@@ -860,7 +860,7 @@ extern void blk_queue_max_segment_size(struct request_queue *, unsigned int); 
extern void blk_queue_max_discard_sectors(struct request_queue *q,

		unsigned int max_discard_sectors);

extern void blk_queue_logical_block_size(struct request_queue *, unsigned short);

extern void blk_queue_physical_block_size(struct request_queue *, unsigned short);

extern void blk_queue_physical_block_size(struct request_queue *, unsigned int);

extern void blk_queue_alignment_offset(struct request_queue *q,

				       unsigned int alignment);

extern void blk_limits_io_min(struct queue_limits *limits, unsigned int min);
@@ -1013,7 +1013,7 @@ static inline unsigned int queue_physical_block_size(struct request_queue *q) 
	return q->limits.physical_block_size;

}



static inline int bdev_physical_block_size(struct block_device *bdev)

static inline unsigned int bdev_physical_block_size(struct block_device *bdev)

{

	return queue_physical_block_size(bdev_get_queue(bdev));

}