summaryrefslogtreecommitdiff
path: root/sys/geom/geom_disk.c
diff options
context:
space:
mode:
authorPawel Jakub Dawidek <pjd@FreeBSD.org>2007-05-05 17:12:15 +0000
committerPawel Jakub Dawidek <pjd@FreeBSD.org>2007-05-05 17:12:15 +0000
commitd0c11f9eb79e05cff1d2e89b6a65c2c1f54ee78f (patch)
tree7d22237201ddbee7705e00419726c8f2c8affff2 /sys/geom/geom_disk.c
parent0589353ac75537f16a33cd1aad2ea93e7111afb7 (diff)
downloadsrc-test-d0c11f9eb79e05cff1d2e89b6a65c2c1f54ee78f.tar.gz
src-test-d0c11f9eb79e05cff1d2e89b6a65c2c1f54ee78f.zip
Notes
Diffstat (limited to 'sys/geom/geom_disk.c')
-rw-r--r--sys/geom/geom_disk.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/sys/geom/geom_disk.c b/sys/geom/geom_disk.c
index 390cd8ff37ec6..482226b368334 100644
--- a/sys/geom/geom_disk.c
+++ b/sys/geom/geom_disk.c
@@ -301,6 +301,8 @@ g_disk_start(struct bio *bp)
break;
else if (g_handleattr_off_t(bp, "GEOM::frontstuff", 0))
break;
+ else if (g_handleattr_str(bp, "GEOM::ident", dp->d_ident))
+ break;
else if (!strcmp(bp->bio_attribute, "GEOM::kerneldump"))
g_disk_kerneldump(bp, dp);
else
@@ -408,7 +410,7 @@ disk_alloc()
void
disk_create(struct disk *dp, int version)
{
- if (version != DISK_VERSION_00) {
+ if (version != DISK_VERSION_00 && version != DISK_VERSION_01) {
printf("WARNING: Attempt to add disk %s%d %s",
dp->d_name, dp->d_unit,
" using incompatible ABI version of disk(9)\n");