aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJens Axboe2010-04-29 02:28:21 -0500
committerJens Axboe2010-04-29 02:28:21 -0500
commit0341aafb7f3313bcedc6811a098500be85f3fc77 (patch)
tree844d674e4f4a9f5200d71f0e71f15e1e9e0daad9 /block/blk-lib.c
parent50eaeb323a170e231263ccb433bb2f99bd9e27ac (diff)
downloadkernel-common-0341aafb7f3313bcedc6811a098500be85f3fc77.tar.gz
kernel-common-0341aafb7f3313bcedc6811a098500be85f3fc77.tar.xz
kernel-common-0341aafb7f3313bcedc6811a098500be85f3fc77.zip
block: fix bad use of min() on different types
Just cast the page size to sector_t, that will always fit. Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Diffstat (limited to 'block/blk-lib.c')
-rw-r--r--block/blk-lib.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/block/blk-lib.c b/block/blk-lib.c
index 886c3f9e1be..d0216b9f22d 100644
--- a/block/blk-lib.c
+++ b/block/blk-lib.c
@@ -124,6 +124,7 @@ struct bio_batch
124static void bio_batch_end_io(struct bio *bio, int err) 124static void bio_batch_end_io(struct bio *bio, int err)
125{ 125{
126 struct bio_batch *bb = bio->bi_private; 126 struct bio_batch *bb = bio->bi_private;
127
127 if (err) { 128 if (err) {
128 if (err == -EOPNOTSUPP) 129 if (err == -EOPNOTSUPP)
129 set_bit(BIO_EOPNOTSUPP, &bb->flags); 130 set_bit(BIO_EOPNOTSUPP, &bb->flags);
@@ -186,8 +187,8 @@ submit:
186 if (flags & BLKDEV_IFL_WAIT) 187 if (flags & BLKDEV_IFL_WAIT)
187 bio->bi_private = &bb; 188 bio->bi_private = &bb;
188 189
189 while(nr_sects != 0) { 190 while (nr_sects != 0) {
190 sz = min(PAGE_SIZE >> 9 , nr_sects); 191 sz = min((sector_t) PAGE_SIZE >> 9 , nr_sects);
191 if (sz == 0) 192 if (sz == 0)
192 /* bio has maximum size possible */ 193 /* bio has maximum size possible */
193 break; 194 break;