diff options
author | grog <grog@FreeBSD.org> | 2000-06-02 04:03:13 +0000 |
---|---|---|
committer | grog <grog@FreeBSD.org> | 2000-06-02 04:03:13 +0000 |
commit | b490d01092ab023a87bbcebcf28a29238afb374c (patch) | |
tree | edbdbea2cb6a1c424c40b3ebac48fbc95f4cb1ae /sys/dev/vinum | |
parent | 25e1326b4bfb649e510fd820d64c280f83a4e178 (diff) | |
download | FreeBSD-src-b490d01092ab023a87bbcebcf28a29238afb374c.zip FreeBSD-src-b490d01092ab023a87bbcebcf28a29238afb374c.tar.gz |
open_drive: Recognize "wd" device type. This is going away, but it's
not gone yet.
format_config: print correct text when a volume has a preferred plex.
This is still broken, but not quite as badly.
Reported-by: Phil Regnauld <regnauld@ftf.net>
Change a rather silly comment.
Diffstat (limited to 'sys/dev/vinum')
-rw-r--r-- | sys/dev/vinum/vinumio.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/sys/dev/vinum/vinumio.c b/sys/dev/vinum/vinumio.c index 8a55e2a..95d717c 100644 --- a/sys/dev/vinum/vinumio.c +++ b/sys/dev/vinum/vinumio.c @@ -75,6 +75,8 @@ open_drive(struct drive *drive, struct proc *p, int verbose) /* Find the device */ if (bcmp(dname, "ad", 2) == 0) /* IDE disk */ devmajor = 116; + else if (bcmp(dname, "wd", 2) == 0) /* IDE disk */ + devmajor = 3; else if (bcmp(dname, "da", 2) == 0) devmajor = 13; else if (bcmp(dname, "vn", 2) == 0) @@ -118,11 +120,6 @@ open_drive(struct drive *drive, struct proc *p, int verbose) if (drive->dev == NULL) /* didn't find anything */ return ENODEV; - /* - * XXX This doesn't really belong here, but we - * get rude remarks from the drivers if we don't - * set it. phk, where are you when I need you? - */ drive->dev->si_iosize_max = DFLTPHYS; drive->lasterror = (*devsw(drive->dev)->d_open) (drive->dev, FWRITE, 0, NULL); @@ -469,6 +466,8 @@ format_config(char *config, int len) "volume %s state %s", vol->name, volume_state(vol->state)); + while (*s) + s++; /* find the end */ if (vol->preferred_plex >= 0) /* preferences, */ snprintf(s, configend - s, @@ -694,8 +693,8 @@ get_volume_label(char *name, int plexes, u_int64_t size, struct disklabel *lp) lp->d_flags = 0; /* - * Fitting unto the vine, a vinum has a single - * track with all its sectors. + * A Vinum volume has a single track with all + * its sectors. */ lp->d_secsize = DEV_BSIZE; /* bytes per sector */ lp->d_nsectors = size; /* data sectors per track */ |