diff --git a/[refs] b/[refs]
index c9f2dfe1d1d5..cdadfb90ab08 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b759113499d6c7cb75fab04f56772579308bc0f8
+refs/heads/master: 4d00aa47e2337dcfe2d8a7215dbde3765b507167
diff --git a/trunk/block/cfq-iosched.c b/trunk/block/cfq-iosched.c
index 0d3b70de3d80..0eb4aff9df68 100644
--- a/trunk/block/cfq-iosched.c
+++ b/trunk/block/cfq-iosched.c
@@ -1908,7 +1908,9 @@ cfq_update_io_seektime(struct cfq_data *cfqd, struct cfq_io_context *cic,
 	sector_t sdist;
 	u64 total;
 
-	if (cic->last_request_pos < rq->sector)
+	if (!cic->last_request_pos)
+		sdist = 0;
+	else if (cic->last_request_pos < rq->sector)
 		sdist = rq->sector - cic->last_request_pos;
 	else
 		sdist = cic->last_request_pos - rq->sector;