---

yaml --- r: 143965 b: refs/heads/master c: 4d00aa4 h: refs/heads/master i: 143963: 81ab4f0 v: v3
git-mirror · Apr 22, 2009 · e4efc21 · e4efc21
1 parent 05afa05
commit e4efc21
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git 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
@@ -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;