| 503 |
|
|
| 504 |
|
if(diskio_stats_ptr->disk_name!=NULL) free(diskio_stats_ptr->disk_name); |
| 505 |
|
|
| 506 |
< |
diskio_stats_ptr->disk_name=strdup(ksp->ks_name); |
| 506 |
> |
diskio_stats_ptr->disk_name=strdup((char *) get_svr_from_bsd(ksp->ks_name)); |
| 507 |
|
diskio_stats_ptr->systime=time(NULL); |
| 508 |
|
num_diskio++; |
| 509 |
|
} |
| 576 |
|
n++; |
| 577 |
|
} |
| 578 |
|
|
| 579 |
+ |
fclose(f); |
| 580 |
+ |
f = NULL; |
| 581 |
+ |
|
| 582 |
|
if (!has_pp_stats) { |
| 583 |
< |
/* This is an older kernel without stats in /proc/partitions. |
| 584 |
< |
Read what we can from /proc/stat instead. */ |
| 583 |
> |
/* This is an older kernel where /proc/partitions doesn't |
| 584 |
> |
contain stats. Read what we can from /proc/stat instead, and |
| 585 |
> |
fill in the appropriate bits of the list allocated above. */ |
| 586 |
|
|
| 587 |
|
f = fopen("/proc/stat", "r"); |
| 588 |
|
if (f == NULL) goto out; |
| 694 |
|
} |
| 695 |
|
|
| 696 |
|
diskio_stats_ptr=get_diskio_stats(&disks); |
| 697 |
+ |
if (diskio_stats_ptr == NULL) { |
| 698 |
+ |
return NULL; |
| 699 |
+ |
} |
| 700 |
|
diskio_stats_diff_ptr=diskio_stats_diff; |
| 701 |
|
|
| 702 |
|
for(x=0;x<sizeof_diskio_stats_diff;x++){ |
