From 1fb79ad91ae634c016cfc42f146d1e64e76ff939 Mon Sep 17 00:00:00 2001 From: NeilBrown Date: Tue, 21 Jun 2005 17:17:28 -0700 Subject: [PATCH] --- yaml --- r: 2597 b: refs/heads/master c: 39730960d94306d7be414e8d54f4e5c071af1278 h: refs/heads/master i: 2595: b30770c79228a20035d695d59c138dbb51385ab4 v: v3 --- [refs] | 2 +- trunk/drivers/md/md.c | 2 +- trunk/include/linux/raid/md_p.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 043e0eeaf5eb..fc00122b9081 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7bfa19f2748000d646dbdf8f48258cfe1d257b52 +refs/heads/master: 39730960d94306d7be414e8d54f4e5c071af1278 diff --git a/trunk/drivers/md/md.c b/trunk/drivers/md/md.c index ef3ad99562c1..65fab74ad737 100644 --- a/trunk/drivers/md/md.c +++ b/trunk/drivers/md/md.c @@ -847,7 +847,7 @@ static int super_1_load(mdk_rdev_t *rdev, mdk_rdev_t *refdev, int minor_version) case 0: sb_offset = rdev->bdev->bd_inode->i_size >> 9; sb_offset -= 8*2; - sb_offset &= ~(4*2-1); + sb_offset &= ~(sector_t)(4*2-1); /* convert from sectors to K */ sb_offset /= 2; break; diff --git a/trunk/include/linux/raid/md_p.h b/trunk/include/linux/raid/md_p.h index 8e592a25a8b5..dc65cd435494 100644 --- a/trunk/include/linux/raid/md_p.h +++ b/trunk/include/linux/raid/md_p.h @@ -202,7 +202,7 @@ struct mdp_superblock_1 { * NOTE: signed, so bitmap can be before superblock * only meaningful of feature_map[0] is set. */ - __u8 pad1[128-96]; /* set to 0 when written */ + __u8 pad1[128-100]; /* set to 0 when written */ /* constant this-device information - 64 bytes */ __u64 data_offset; /* sector start of data, often 0 */