aboutsummaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorPoul-Henning Kamp <phk@FreeBSD.org>2004-02-23 08:55:13 +0000
committerPoul-Henning Kamp <phk@FreeBSD.org>2004-02-23 08:55:13 +0000
commit6fe9c1609ff7ef4b5d5b22304df1d0607610d60f (patch)
treeda0cd5916c6bae9f6a03e2a6211f30b48c4a57c8 /sys
parent652d04726d7ed427df2b1e2aba1a0e1964a90109 (diff)
downloadsrc-6fe9c1609ff7ef4b5d5b22304df1d0607610d60f.tar.gz
src-6fe9c1609ff7ef4b5d5b22304df1d0607610d60f.zip
Fix vinums cdevsw{} to initialize d_version.
The nonstandard formatting made my mega-patch scripts miss it. Retire the static major number while we're here anyway. Reported by: Niels Chr. Bank-Pedersen <ncbp@bank-pedersen.dk>
Notes
Notes: svn path=/head/; revision=126157
Diffstat (limited to 'sys')
-rw-r--r--sys/conf/majors1
-rw-r--r--sys/dev/vinum/vinum.c21
-rw-r--r--sys/dev/vinum/vinumvar.h2
3 files changed, 10 insertions, 14 deletions
diff --git a/sys/conf/majors b/sys/conf/majors
index 9fdcc556e467..2fd4abd19c35 100644
--- a/sys/conf/majors
+++ b/sys/conf/majors
@@ -55,7 +55,6 @@
86 alog Industrial Computer Source AIO8-P driver (deprecated)
87 wfd ATAPI floppy client of "wd"
90 wst ATAPI tape client of "wd"
-91 *vinum Volume manager
92 *bktr Bt848 video capture driver (hasty@star-gate.com)
93 *coda CODA filesystem.
96 altq alternate queueing (including cbq, red, wfq)
diff --git a/sys/dev/vinum/vinum.c b/sys/dev/vinum/vinum.c
index 513c0d968c59..8e1bf36c484a 100644
--- a/sys/dev/vinum/vinum.c
+++ b/sys/dev/vinum/vinum.c
@@ -54,17 +54,16 @@ extern struct mc malloced[];
#endif
#include <dev/vinum/request.h>
-struct cdevsw vinum_cdevsw =
-{
- .d_open = vinumopen,
- .d_close = vinumclose,
- .d_read = physread,
- .d_write = physwrite,
- .d_ioctl = vinumioctl,
- .d_strategy = vinumstrategy,
- .d_name = "vinum",
- .d_maj = VINUM_CDEV_MAJOR,
- .d_flags = D_DISK
+struct cdevsw vinum_cdevsw = {
+ .d_version = D_VERSION,
+ .d_open = vinumopen,
+ .d_close = vinumclose,
+ .d_read = physread,
+ .d_write = physwrite,
+ .d_ioctl = vinumioctl,
+ .d_strategy = vinumstrategy,
+ .d_name = "vinum",
+ .d_flags = D_DISK | D_NEEDGIANT
};
/* Called by main() during pseudo-device attachment. */
diff --git a/sys/dev/vinum/vinumvar.h b/sys/dev/vinum/vinumvar.h
index 61303915444a..807439c6bcbf 100644
--- a/sys/dev/vinum/vinumvar.h
+++ b/sys/dev/vinum/vinumvar.h
@@ -67,8 +67,6 @@ enum constants {
MAXCONFIGLINE = 1024, /* maximum size of a single config line */
MINVINUMSLICE = 1048576, /* minimum size of a slice */
- VINUM_CDEV_MAJOR = 91, /* major number for character device */
-
ROUND_ROBIN_READPOL = -1, /* round robin read policy */
/*