---

yaml --- r: 2597 b: refs/heads/master c: 3973096 h: refs/heads/master i: 2595: b30770c v: v3
git-mirror · Jun 22, 2005 · 1fb79ad · 1fb79ad
1 parent e15af74
commit 1fb79ad
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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 */