---

yaml --- r: 176091 b: refs/heads/master c: 624ce4f h: refs/heads/master i: 176089: 56ca0bb 176087: 61b8685 v: v3
git-mirror · Dec 14, 2009 · 8378346 · 8378346
1 parent d364fbb
commit 8378346
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 43a705076e51c5af21ec4260a35699775ea298f5
+refs/heads/master: 624ce4f5658fa3e0303c1217bba2706142fe7568
diff --git a/trunk/drivers/md/bitmap.c b/trunk/drivers/md/bitmap.c
@@ -625,7 +625,6 @@ static int bitmap_read_sb(struct bitmap *bitmap)
 	/* assign fields using values from superblock */
 	bitmap->mddev->bitmap_info.chunksize = chunksize;
 	bitmap->mddev->bitmap_info.daemon_sleep = daemon_sleep;
-	bitmap->daemon_lastrun = jiffies;
 	bitmap->mddev->bitmap_info.max_write_behind = write_behind;
 	bitmap->flags |= le32_to_cpu(sb->state);
 	if (le32_to_cpu(sb->version) == BITMAP_MAJOR_HOSTENDIAN)
@@ -1663,6 +1662,7 @@ int bitmap_create(mddev_t *mddev)
 	if (err)
 		goto error;
 
+	bitmap->daemon_lastrun = jiffies;
 	bitmap->chunkshift = ffz(~mddev->bitmap_info.chunksize);
 
 	/* now that chunksize and chunkshift are set, we can use these macros */