From 5c140c42fb6c1fca36fc6b605dbb94abb1ff7e40 Mon Sep 17 00:00:00 2001
From: Jens Axboe <jens.axboe@oracle.com>
Date: Thu, 29 Apr 2010 09:28:21 +0200
Subject: [PATCH] --- yaml --- r: 196825 b: refs/heads/master c:
 0341aafb7f3313bcedc6811a098500be85f3fc77 h: refs/heads/master i:   196823:
 956ff74e9991d850df67b4a2010c9c9b6cb5d278 v: v3

---
 [refs]                | 2 +-
 trunk/block/blk-lib.c | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 721b5e69e794..1af0de6b1d87 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 50eaeb323a170e231263ccb433bb2f99bd9e27ac
+refs/heads/master: 0341aafb7f3313bcedc6811a098500be85f3fc77
diff --git a/trunk/block/blk-lib.c b/trunk/block/blk-lib.c
index 886c3f9e1be4..d0216b9f22d4 100644
--- a/trunk/block/blk-lib.c
+++ b/trunk/block/blk-lib.c
@@ -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);
@@ -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;