md: Introduction - bugfix patches for md.
PATCH 1/1 md: Introduction - bugfix patches for md.
Following are 4 bugfix patches for md.
The first is suitable for 2.6.18.2. All are suitable for 2.6.19.
Thanks,
NeilBrown
[PATCH 001 of 4] md: Fix calculation of ->degraded for multipath and raid10 [PATCH 002 of 4] md: Add another COMPAT_IOCTL for md.
[PATCH 003 of 4] md: Endian annotation for v1 superblock access. [PATCH 004 of 4] md: Endian annotations for the bitmap superblock
PATCH 1/1 md: Fix calculation of ->degraded for multipath and raid10
Two less-used md personalities have bugs in the calculation of
->degraded (the extent to which the array is degraded).
### Diffstat output
./drivers/md/multipath.c | 2 +- ./drivers/md/raid10.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/md/multipath.c +1 -1
@@ -501,7 +501,7 @@ static int multipath_run (mddev_t *mddev mdname(mddev)); goto out_free_conf; } - mddev->degraded = conf->raid_disks = conf->working_disks; + mddev->degraded = conf->raid_disks - conf->working_disks; conf->pool =mempool_create_kzalloc_pool (NR_RESERVED_BUFS ,sizeof (struct multipath_bh ));
drivers/md/raid10.c +1 -1
@@ -2079,7 +2079,7 @@ static int run(mddev_t *mddev) disk = conf->mirrors + i;if (!disk->rdev || - !test_bit (In_sync, &rdev->flags)) { + !test_bit (In_sync, &disk->rdev->flags)) { disk->head_position =0 ; mddev->degraded++; }
PATCH 1/1 md: Add another COMPAT_IOCTL for md.
In reply to NeilBrown.. so that you can use bitmaps with 32bit userspace on a 64 bit kernel.
### Diffstat output
./include/linux/compat_ioctl.h | 1 + 1 file changed, 1 insertion(+)
include/linux/compat_ioctl.h +1 -0
@@ -131,6 +131,7 @@ COMPATIBLE_IOCTL(RUN_ARRAY) COMPATIBLE_IOCTL(STOP_ARRAY) COMPATIBLE_IOCTL(STOP_ARRAY_RO) COMPATIBLE_IOCTL(RESTART_ARRAY_RW) +COMPATIBLE_IOCTL(GET_BITMAP_FILE) ULONG_IOCTL(SET_BITMAP_FILE) /* DM */ COMPATIBLE_IOCTL(DM_VERSION_32)
PATCH 1/1 md: Endian annotation for v1 superblock access.
In reply to NeilBrownIncludes a couple of bugfixed found by sparse.
### Diffstat output
./drivers/md/md.c | 13 +++++---- ./include/linux/raid/md_p.h | 58 ++++++++++++++++++++++---------------------- 2 files changed, 36 insertions(+), 35 deletions(-)
drivers/md/md.c +7 -6
@@ -974,12 +974,13 @@ static void super_90_sync(mddev_t *mddev* version 1 superblock */ -static unsigned int calc_sb_1_csum (struct mdp_superblock_1 * sb) +static __le32 calc_sb_1_csum (struct mdp_superblock_1 * sb) { -unsigned int disk_csum, csum; +__le32 disk_csum; +u32 csum;unsigned long long newcsum;int size =256 +le32_to_cpu (sb->max_dev)*2 ; -unsigned int *isuper = (unsigned int *)sb; +__le32 *isuper = (__le32 *)sb;int i; disk_csum = sb->sb_csum;
@@ -989,7 +990,7 @@ static unsigned int calc_sb_1_csum(struc newcsum +=le32_to_cpu (*isuper++);if (size ==2 ) - newcsum +=le16_to_cpu (*(unsigned short *) isuper); + newcsum +=le16_to_cpu (*(__le16 *) isuper); csum = (newcsum &0xffffffff ) + (newcsum >>32 ); sb->sb_csum = disk_csum;
@@ -1106,7 +1107,7 @@ static int super_1_load(mdk_rdev_t *rdevif (le32_to_cpu (sb->chunksize)) rdev->size &= ~((sector_t )le32_to_cpu (sb->chunksize)/2 -1 ); -if (le32_to_cpu (sb->size) > rdev->size*2 ) +if (le64_to_cpu (sb->size) > rdev->size*2 )return -EINVAL ;return ret; }
@@ -1228,7 +1229,7 @@ static void super_1_sync(mddev_t *mddev,else sb->resync_offset =cpu_to_le64 (0 ); - sb->cnt_corrected_read =atomic_read (&rdev->corrected_errors); + sb->cnt_corrected_read =cpu_to_le32 (atomic_read (&rdev->corrected_errors)); sb->raid_disks =cpu_to_le32 (mddev->raid_disks); sb->size =cpu_to_le64 (mddev->size<<1 );
include/linux/raid/md_p.h +29 -29
88 lines not on this page · raw message
PATCH 1/1 md: Endian annotations for the bitmap superblock
In reply to NeilBrownAnd a couple of bug fixes found by sparse.
### Diffstat output
./drivers/md/bitmap.c | 10 +++++----- ./include/linux/raid/bitmap.h | 20 ++++++++++---------- 2 files changed, 15 insertions(+), 15 deletions(-)
drivers/md/bitmap.c +5 -5
@@ -536,7 +536,7 @@ static int bitmap_read_sb(struct bitmapprintk (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 bitspin_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 (); }
include/linux/raid/bitmap.h +10 -10
@@ -146,16 +146,16 @@ enum bitmap_state {/* the superblock at the front of the bitmap file -- little endian */ typedef struct bitmap_super_s { -__u32 magic;/* 0 BITMAP_MAGIC */ -__u32 version;/* 4 the bitmap major for now, could change... */ -__u8 uuid[16 ];/* 8 128 bit uuid - must match md device uuid */ -__u64 events;/* 24 event counter for the bitmap (1)*/ -__u64 events_cleared;/*32 event counter when last bit cleared (2) */ -__u64 sync_size;/* 40 the size of the md device's sync range(3) */ -__u32 state;/* 48 bitmap state information */ -__u32 chunksize;/* 52 the bitmap chunk size in bytes */ -__u32 daemon_sleep;/* 56 seconds between disk flushes */ -__u32 write_behind;/* 60 number of outstanding write-behind writes */ +__le32 magic;/* 0 BITMAP_MAGIC */ +__le32 version;/* 4 the bitmap major for now, could change... */ +__u8 uuid[16 ];/* 8 128 bit uuid - must match md device uuid */ +__le64 events;/* 24 event counter for the bitmap (1)*/ +__le64 events_cleared;/*32 event counter when last bit cleared (2) */ +__le64 sync_size;/* 40 the size of the md device's sync range(3) */ +__le32 state;/* 48 bitmap state information */ +__le32 chunksize;/* 52 the bitmap chunk size in bytes */ +__le32 daemon_sleep;/* 56 seconds between disk flushes */ +__le32 write_behind;/* 60 number of outstanding write-behind writes */ __u8 pad[256 -64 ];/* set to zero */ }bitmap_super_t ;