Skip to content

Commit

Permalink
block: fix bad use of min() on different types
Browse files Browse the repository at this point in the history
Just cast the page size to sector_t, that will always fit.

Signed-off-by: Jens Axboe <[email protected]>
  • Loading branch information
Jens Axboe committed Apr 29, 2010
1 parent 50eaeb3 commit 0341aaf
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions block/blk-lib.c
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,7 @@ struct bio_batch
static void bio_batch_end_io(struct bio *bio, int err)
{
struct bio_batch *bb = bio->bi_private;

if (err) {
if (err == -EOPNOTSUPP)
set_bit(BIO_EOPNOTSUPP, &bb->flags);
Expand Down Expand Up @@ -186,8 +187,8 @@ int blkdev_issue_zeroout(struct block_device *bdev, sector_t sector,
if (flags & BLKDEV_IFL_WAIT)
bio->bi_private = &bb;

while(nr_sects != 0) {
sz = min(PAGE_SIZE >> 9 , nr_sects);
while (nr_sects != 0) {
sz = min((sector_t) PAGE_SIZE >> 9 , nr_sects);
if (sz == 0)
/* bio has maximum size possible */
break;
Expand Down

0 comments on commit 0341aaf

Please sign in to comment.