Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 624ce4f5 authored by NeilBrown's avatar NeilBrown
Browse files

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: default avatarNeilBrown <neilb@suse.de>
parent 43a70507

drivers/md/bitmap.c

+1 −1
Original line number Diff line number Diff line
@@ -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 */