forked from luck/tmp_suning_uos_patched
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>
This commit is contained in:
parent
43a705076e
commit
624ce4f565
|
@ -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 */
|
||||
|
|
Loading…
Reference in New Issue
Block a user