mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 02:32:09 -04:00
[PATCH] md: endian annotations for the bitmap superblock
And a couple of bug fixes found by sparse. Signed-off-by: Neil Brown <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
This commit is contained in:
parent
1c05b4bc22
commit
4f2e639af4
2 changed files with 15 additions and 15 deletions
|
|
@ -536,7 +536,7 @@ static int bitmap_read_sb(struct bitmap *bitmap)
|
|||
printk(KERN_INFO "%s: bitmap file is out of date (%llu < %llu) "
|
||||
"-- forcing full recovery\n", bmname(bitmap), events,
|
||||
(unsigned long long) bitmap->mddev->events);
|
||||
sb->state |= BITMAP_STALE;
|
||||
sb->state |= cpu_to_le32(BITMAP_STALE);
|
||||
}
|
||||
success:
|
||||
/* assign fields using values from superblock */
|
||||
|
|
@ -544,11 +544,11 @@ success:
|
|||
bitmap->daemon_sleep = daemon_sleep;
|
||||
bitmap->daemon_lastrun = jiffies;
|
||||
bitmap->max_write_behind = write_behind;
|
||||
bitmap->flags |= sb->state;
|
||||
bitmap->flags |= le32_to_cpu(sb->state);
|
||||
if (le32_to_cpu(sb->version) == BITMAP_MAJOR_HOSTENDIAN)
|
||||
bitmap->flags |= BITMAP_HOSTENDIAN;
|
||||
bitmap->events_cleared = le64_to_cpu(sb->events_cleared);
|
||||
if (sb->state & BITMAP_STALE)
|
||||
if (sb->state & cpu_to_le32(BITMAP_STALE))
|
||||
bitmap->events_cleared = bitmap->mddev->events;
|
||||
err = 0;
|
||||
out:
|
||||
|
|
@ -578,9 +578,9 @@ static void bitmap_mask_state(struct bitmap *bitmap, enum bitmap_state bits,
|
|||
spin_unlock_irqrestore(&bitmap->lock, flags);
|
||||
sb = (bitmap_super_t *)kmap_atomic(bitmap->sb_page, KM_USER0);
|
||||
switch (op) {
|
||||
case MASK_SET: sb->state |= bits;
|
||||
case MASK_SET: sb->state |= cpu_to_le32(bits);
|
||||
break;
|
||||
case MASK_UNSET: sb->state &= ~bits;
|
||||
case MASK_UNSET: sb->state &= cpu_to_le32(~bits);
|
||||
break;
|
||||
default: BUG();
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue