diff options
author | NeilBrown <neilb@suse.de> | 2009-12-13 20:49:56 -0500 |
---|---|---|
committer | NeilBrown <neilb@suse.de> | 2009-12-13 20:51:41 -0500 |
commit | 624ce4f5658fa3e0303c1217bba2706142fe7568 (patch) | |
tree | d2ceb07051efba40b01ddd76cfc93f4ed89ed831 /drivers | |
parent | 43a705076e51c5af21ec4260a35699775ea298f5 (diff) |
md/bitmap: move setting of daemon_lastrun out of bitmap_read_sb
Setting daemon_lastrun really has nothing to do with reading
the bitmap superblock, it just happens to be needed at the same time.
bitmap_read_sb is about to become options, so move that code out
to after the call to bitmap_read_sb.
Signed-off-by: NeilBrown <neilb@suse.de>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/md/bitmap.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/md/bitmap.c b/drivers/md/bitmap.c index 24fff75b2191..62958491f329 100644 --- a/drivers/md/bitmap.c +++ b/drivers/md/bitmap.c | |||
@@ -625,7 +625,6 @@ success: | |||
625 | /* assign fields using values from superblock */ | 625 | /* assign fields using values from superblock */ |
626 | bitmap->mddev->bitmap_info.chunksize = chunksize; | 626 | bitmap->mddev->bitmap_info.chunksize = chunksize; |
627 | bitmap->mddev->bitmap_info.daemon_sleep = daemon_sleep; | 627 | bitmap->mddev->bitmap_info.daemon_sleep = daemon_sleep; |
628 | bitmap->daemon_lastrun = jiffies; | ||
629 | bitmap->mddev->bitmap_info.max_write_behind = write_behind; | 628 | bitmap->mddev->bitmap_info.max_write_behind = write_behind; |
630 | bitmap->flags |= le32_to_cpu(sb->state); | 629 | bitmap->flags |= le32_to_cpu(sb->state); |
631 | if (le32_to_cpu(sb->version) == BITMAP_MAJOR_HOSTENDIAN) | 630 | if (le32_to_cpu(sb->version) == BITMAP_MAJOR_HOSTENDIAN) |
@@ -1663,6 +1662,7 @@ int bitmap_create(mddev_t *mddev) | |||
1663 | if (err) | 1662 | if (err) |
1664 | goto error; | 1663 | goto error; |
1665 | 1664 | ||
1665 | bitmap->daemon_lastrun = jiffies; | ||
1666 | bitmap->chunkshift = ffz(~mddev->bitmap_info.chunksize); | 1666 | bitmap->chunkshift = ffz(~mddev->bitmap_info.chunksize); |
1667 | 1667 | ||
1668 | /* now that chunksize and chunkshift are set, we can use these macros */ | 1668 | /* now that chunksize and chunkshift are set, we can use these macros */ |