From 0e4a21910a8ffbaac05d237702074889253633e6 Mon Sep 17 00:00:00 2001 From: "Martin K. Petersen" Date: Wed, 13 Oct 2010 21:18:03 +0200 Subject: [PATCH] --- yaml --- r: 213068 b: refs/heads/master c: 892b6f90db81cccb723d5d92f4fddc2d68b206e1 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/block/blk-settings.c | 2 +- trunk/include/linux/blkdev.h | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 8c1d1aaeab87..a1a6114717b9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c49c06e4960949a9bced708858433fcf6ca36a9c +refs/heads/master: 892b6f90db81cccb723d5d92f4fddc2d68b206e1 diff --git a/trunk/block/blk-settings.c b/trunk/block/blk-settings.c index a3600a7ab8bb..315b88c8cbbb 100644 --- a/trunk/block/blk-settings.c +++ b/trunk/block/blk-settings.c @@ -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; diff --git a/trunk/include/linux/blkdev.h b/trunk/include/linux/blkdev.h index 1341df5806df..8f3dd981b973 100644 --- a/trunk/include/linux/blkdev.h +++ b/trunk/include/linux/blkdev.h @@ -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)); }