mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2025-01-19 12:24:34 +08:00
md/bitmap: remove single-bit manipulation on sb->state
Just do single-bit manipulations on bitmap->flags and copy whole value between that and sb->state. This will allow next patch which changes how bit manipulations are performed on bitmap->flags. This does result in BITMAP_STALE not being set in sb by bitmap_read_sb, however as the setting is determined by other information in the 'sb' we do not lose information this way. Normally, bitmap_load will be called shortly which will clear BITMAP_STALE anyway. Signed-off-by: NeilBrown <neilb@suse.de>
This commit is contained in:
parent
edbb79df67
commit
84e923453e
@ -522,7 +522,7 @@ static int bitmap_new_disk_sb(struct bitmap *bitmap)
|
||||
memcpy(sb->uuid, bitmap->mddev->uuid, 16);
|
||||
|
||||
bitmap->flags |= BITMAP_STALE;
|
||||
sb->state |= cpu_to_le32(BITMAP_STALE);
|
||||
sb->state = cpu_to_le32(bitmap->flags);
|
||||
bitmap->events_cleared = bitmap->mddev->events;
|
||||
sb->events_cleared = cpu_to_le64(bitmap->mddev->events);
|
||||
|
||||
@ -617,7 +617,7 @@ static int bitmap_read_sb(struct bitmap *bitmap)
|
||||
"-- forcing full recovery\n",
|
||||
bmname(bitmap), events,
|
||||
(unsigned long long) bitmap->mddev->events);
|
||||
sb->state |= cpu_to_le32(BITMAP_STALE);
|
||||
bitmap->flags |= BITMAP_STALE;
|
||||
}
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user