diff options
| -rw-r--r-- | drivers/md/raid5.c | 2 | ||||
| -rw-r--r-- | include/linux/raid/md_p.h | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c index 72e8a324dcfb..009344156751 100644 --- a/drivers/md/raid5.c +++ b/drivers/md/raid5.c | |||
| @@ -5231,8 +5231,6 @@ static void *raid5_takeover(mddev_t *mddev) | |||
| 5231 | * raid1 - if there are two drives. We need to know the chunk size | 5231 | * raid1 - if there are two drives. We need to know the chunk size |
| 5232 | * raid4 - trivial - just use a raid4 layout. | 5232 | * raid4 - trivial - just use a raid4 layout. |
| 5233 | * raid6 - Providing it is a *_6 layout | 5233 | * raid6 - Providing it is a *_6 layout |
| 5234 | * | ||
| 5235 | * For now, just do raid1 | ||
| 5236 | */ | 5234 | */ |
| 5237 | 5235 | ||
| 5238 | if (mddev->level == 1) | 5236 | if (mddev->level == 1) |
diff --git a/include/linux/raid/md_p.h b/include/linux/raid/md_p.h index 6ba830fa8538..ffa2efbbe382 100644 --- a/include/linux/raid/md_p.h +++ b/include/linux/raid/md_p.h | |||
| @@ -232,7 +232,7 @@ struct mdp_superblock_1 { | |||
| 232 | __le64 reshape_position; /* next address in array-space for reshape */ | 232 | __le64 reshape_position; /* next address in array-space for reshape */ |
| 233 | __le32 delta_disks; /* change in number of raid_disks */ | 233 | __le32 delta_disks; /* change in number of raid_disks */ |
| 234 | __le32 new_layout; /* new layout */ | 234 | __le32 new_layout; /* new layout */ |
| 235 | __le32 new_chunk; /* new chunk size (bytes) */ | 235 | __le32 new_chunk; /* new chunk size (512byte sectors) */ |
| 236 | __u8 pad1[128-124]; /* set to 0 when written */ | 236 | __u8 pad1[128-124]; /* set to 0 when written */ |
| 237 | 237 | ||
| 238 | /* constant this-device information - 64 bytes */ | 238 | /* constant this-device information - 64 bytes */ |