d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Correct calculation of RAID0 sizes on VIA RAID arrays.

Browse Source
This commit is contained in:
sos 2005-12-14 12:11:51 +00:00
parent 265803afe8
commit 5498992155
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sys/dev/ata/ata-raid.c
View File

@ -3396,19 +3396,21 @@ ata_raid_via_read_meta(device_t dev, struct ar_softc **raidp)
case VIA_T_RAID0:
raid->type = AR_T_RAID0;
raid->width = meta->stripe_layout & VIA_L_MASK;
raid->total_sectors = meta->total_sectors;
if (!raid->total_sectors ||
(raid->total_sectors > (raid->width * meta->disk_sectors)))
raid->total_sectors = raid->width * meta->disk_sectors;
break;
case VIA_T_RAID1:
raid->type = AR_T_RAID1;
raid->width = 1;
raid->total_sectors = meta->total_sectors;
raid->total_sectors = meta->disk_sectors;
break;
case VIA_T_SPAN:
raid->type = AR_T_SPAN;
raid->width = 1;
raid->total_sectors += meta->total_sectors;
raid->total_sectors += meta->disk_sectors;
break;
default:
@ -3433,7 +3435,7 @@ ata_raid_via_read_meta(device_t dev, struct ar_softc **raidp)
if ((meta->disks[disk] == meta->disk_id) &&
((disk * sizeof(int32_t)) == (meta->disk_index & VIA_D_MASK))) {
raid->disks[disk].dev = parent;
raid->disks[disk].sectors = meta->total_sectors / raid->width;
raid->disks[disk].sectors = meta->disk_sectors;
raid->disks[disk].flags =
(AR_DF_ONLINE | AR_DF_PRESENT | AR_DF_ASSIGNED);
ars->raid[raid->volume] = raid;
@ -4409,8 +4411,8 @@ ata_raid_via_print_meta(struct via_raid_conf *meta)
printf("stripe_disks %d\n", meta->stripe_layout & VIA_L_MASK);
printf("stripe_sectors %d\n",
0x08 << (meta->stripe_layout >> VIA_L_SHIFT));
printf("total_sectors %llu\n",
(unsigned long long)meta->total_sectors);
printf("disk_sectors %llu\n",
(unsigned long long)meta->disk_sectors);
printf("disk_id 0x%08x\n", meta->disk_id);
printf("DISK# disk_id\n");
for (i = 0; i < 8; i++) {

2
sys/dev/ata/ata-raid.h
View File

@ -757,7 +757,7 @@ struct via_raid_conf {
#define VIA_L_MASK 0x07
#define VIA_L_SHIFT 4
u_int64_t total_sectors;
u_int64_t disk_sectors;
u_int32_t disk_id;
u_int32_t disks[8];
u_int8_t checksum;