From 837834627e0c98f8bbcfcc9341ae37937fc2295e Mon Sep 17 00:00:00 2001 From: NeilBrown Date: Mon, 14 Dec 2009 12:49:56 +1100 Subject: [PATCH] --- yaml --- r: 176091 b: refs/heads/master c: 624ce4f5658fa3e0303c1217bba2706142fe7568 h: refs/heads/master i: 176089: 56ca0bbc417d48f7506efadb43340e42a78a3e7e 176087: 61b86859cbcd250d3784db4b0c38626c162fc5ec v: v3 --- [refs] | 2 +- trunk/drivers/md/bitmap.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index d41c68b3bd6e..573553ee92f1 100644 --- 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 index 24fff75b2191..62958491f329 100644 --- 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 */