Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

block: fix bad use of min() on different types

Browse source 
Just cast the page size to sector_t, that will always fit.

Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
This commit is contained in:
Jens Axboe 2010-04-29 09:28:21 +02:00
parent 50eaeb323a
commit 0341aafb7f
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
block/blk-lib.c
View file

@ -124,6 +124,7 @@ struct bio_batch
static void bio_batch_end_io(struct bio *bio, int err) static void bio_batch_end_io(struct bio *bio, int err)
{ {
struct bio_batch *bb = bio->bi_private; struct bio_batch *bb = bio->bi_private;
if (err) { if (err) {
if (err == -EOPNOTSUPP) if (err == -EOPNOTSUPP)
set_bit(BIO_EOPNOTSUPP, &bb->flags); set_bit(BIO_EOPNOTSUPP, &bb->flags);
@ -186,8 +187,8 @@ int blkdev_issue_zeroout(struct block_device *bdev, sector_t sector,
if (flags & BLKDEV_IFL_WAIT) if (flags & BLKDEV_IFL_WAIT)
bio->bi_private = &bb; bio->bi_private = &bb;
while(nr_sects != 0) { while (nr_sects != 0) {
sz = min(PAGE_SIZE >> 9 , nr_sects); sz = min((sector_t) PAGE_SIZE >> 9 , nr_sects);
if (sz == 0) if (sz == 0)
/* bio has maximum size possible */ /* bio has maximum size possible */
break; break;