From 512c3373155cec986eb381e0c078f0e61d103eba Mon Sep 17 00:00:00 2001 From: Neil Brown Date: Mon, 25 Oct 2004 04:13:38 -0700 Subject: [PATCH] md: fixes to make version-1 superblocks work in md driver Add some missing data_offset additions and some le_to_cpu convertions and fix a few other little mistakes. Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- include/linux/raid/md.h | 2 +- include/linux/raid/md_p.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'include') diff --git a/include/linux/raid/md.h b/include/linux/raid/md.h index fad5699f5b7c..a6a67d102bfa 100644 --- a/include/linux/raid/md.h +++ b/include/linux/raid/md.h @@ -60,7 +60,7 @@ */ #define MD_MAJOR_VERSION 0 #define MD_MINOR_VERSION 90 -#define MD_PATCHLEVEL_VERSION 0 +#define MD_PATCHLEVEL_VERSION 1 extern int register_md_personality (int p_num, mdk_personality_t *p); extern int unregister_md_personality (int p_num); diff --git a/include/linux/raid/md_p.h b/include/linux/raid/md_p.h index 022b607bf9d8..8ba95d67329f 100644 --- a/include/linux/raid/md_p.h +++ b/include/linux/raid/md_p.h @@ -197,7 +197,7 @@ struct mdp_superblock_1 { __u32 chunksize; /* in 512byte sectors */ __u32 raid_disks; - __u8 pad1[128-92]; /* set to 0 when written */ + __u8 pad1[128-96]; /* set to 0 when written */ /* constant this-device information - 64 bytes */ __u64 data_offset; /* sector start of data, often 0 */ @@ -215,7 +215,7 @@ struct mdp_superblock_1 { __u64 resync_offset; /* data before this offset (from data_offset) known to be in sync */ __u32 sb_csum; /* checksum upto devs[max_dev] */ __u32 max_dev; /* size of devs[] array to consider */ - __u8 pad3[64-40]; /* set to 0 when writing */ + __u8 pad3[64-32]; /* set to 0 when writing */ /* device state information. Indexed by dev_number. * 2 bytes per device -- cgit v1.2.3