---

yaml --- r: 10181 b: refs/heads/master c: b298264 h: refs/heads/master i: 10179: a21b340 v: v3
git-mirror · Oct 28, 2005 · 3da4edb · 3da4edb
1 parent 2f4b56a
commit 3da4edb
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 20e5c81fcff89535dced2ed71cf24c6c648ff40e
+refs/heads/master: b2982649ce38293b14684b26bcda20cfc54164e6
diff --git a/trunk/drivers/block/ll_rw_blk.c b/trunk/drivers/block/ll_rw_blk.c
@@ -2433,6 +2433,9 @@ void disk_round_stats(struct gendisk *disk)
 {
 	unsigned long now = jiffies;
 
+	if (now == disk->stamp)
+		return;
+
 	if (disk->in_flight) {
 		__disk_stat_add(disk, time_in_queue,
 				disk->in_flight * (now - disk->stamp));