diff options
| author | grehan <grehan@FreeBSD.org> | 2013-07-05 05:47:10 +0000 |
|---|---|---|
| committer | grehan <grehan@FreeBSD.org> | 2013-07-05 05:47:10 +0000 |
| commit | 6a7baaf83640e0eaa135d2f7a3c1d4401f1683bf (patch) | |
| tree | 83ae82cf8f72af4b819f49aa52acdd97f74c6328 /sys/geom/geom_disk.c | |
| parent | 2cb5a953f0a60811764ccaca7c37b51ff007c711 (diff) | |
| parent | 8e6b84b998690dcfc1a4957dc7a483ac5b600db8 (diff) | |
| download | FreeBSD-src-6a7baaf83640e0eaa135d2f7a3c1d4401f1683bf.zip FreeBSD-src-6a7baaf83640e0eaa135d2f7a3c1d4401f1683bf.tar.gz | |
IFC @ r252763
Diffstat (limited to 'sys/geom/geom_disk.c')
| -rw-r--r-- | sys/geom/geom_disk.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/sys/geom/geom_disk.c b/sys/geom/geom_disk.c index a9f7048..60cff73 100644 --- a/sys/geom/geom_disk.c +++ b/sys/geom/geom_disk.c @@ -148,14 +148,12 @@ g_disk_access(struct g_provider *pp, int r, int w, int e) dp->d_name, dp->d_unit); dp->d_maxsize = DFLTPHYS; } - if (dp->d_flags & DISKFLAG_CANDELETE) { - if (bootverbose && dp->d_delmaxsize == 0) { - printf("WARNING: Disk drive %s%d has no d_delmaxsize\n", - dp->d_name, dp->d_unit); - dp->d_delmaxsize = dp->d_maxsize; + if (dp->d_delmaxsize == 0) { + if (bootverbose && dp->d_flags & DISKFLAG_CANDELETE) { + printf("WARNING: Disk drive %s%d has no " + "d_delmaxsize\n", dp->d_name, dp->d_unit); } - } else { - dp->d_delmaxsize = 0; + dp->d_delmaxsize = dp->d_maxsize; } pp->stripeoffset = dp->d_stripeoffset; pp->stripesize = dp->d_stripesize; @@ -629,7 +627,7 @@ void disk_create(struct disk *dp, int version) { - if (version != DISK_VERSION_02) { + if (version != DISK_VERSION) { printf("WARNING: Attempt to add disk %s%d %s", dp->d_name, dp->d_unit, " using incompatible ABI version of disk(9)\n"); |
