diff options
Diffstat (limited to 'sys/miscfs')
| -rw-r--r-- | sys/miscfs/devfs/devfs_tree.c | 6 | ||||
| -rw-r--r-- | sys/miscfs/devfs/devfsdefs.h | 4 | ||||
| -rw-r--r-- | sys/miscfs/specfs/spec_vnops.c | 7 |
3 files changed, 8 insertions, 9 deletions
diff --git a/sys/miscfs/devfs/devfs_tree.c b/sys/miscfs/devfs/devfs_tree.c index 0fe76be98b7a..ffcb243d72e0 100644 --- a/sys/miscfs/devfs/devfs_tree.c +++ b/sys/miscfs/devfs/devfs_tree.c @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: devfs_tree.c,v 1.53 1998/04/20 03:57:35 julian Exp $ + * $Id: devfs_tree.c,v 1.54 1998/06/21 14:53:20 bde Exp $ */ @@ -1061,7 +1061,7 @@ devfs_add_devswf(void *devsw, int minor, int chrblk, uid_t uid, devnm_p new_dev; dn_p dnp; /* devnode for parent directory */ struct cdevsw *cd; - struct bdevsw *bd; + struct cdevsw *bd; int retval; union typeinfo by; @@ -1106,7 +1106,7 @@ devfs_add_devswf(void *devsw, int minor, int chrblk, uid_t uid, break; case DV_BLK: bd = devsw; - major = bd->d_maj; + major = bd->d_bmaj; if ( major == -1 ) return NULL; by.Bdev.bdevsw = bd; by.Bdev.dev = makedev(major, minor); diff --git a/sys/miscfs/devfs/devfsdefs.h b/sys/miscfs/devfs/devfsdefs.h index ef31dd9ae0d4..cbde81df1593 100644 --- a/sys/miscfs/devfs/devfsdefs.h +++ b/sys/miscfs/devfs/devfsdefs.h @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: devfsdefs.h,v 1.13 1998/01/02 07:31:07 julian Exp $ + * $Id: devfsdefs.h,v 1.14 1998/04/19 23:32:20 julian Exp $ */ #ifdef DEVFS_DEBUG #define DBPRINT(A) printf(A) @@ -120,7 +120,7 @@ struct devnode /* the equivalent of an INODE */ dev_t dev; }Cdev; struct { - struct bdevsw *bdevsw; + struct cdevsw *bdevsw; dev_t dev; }Bdev; struct { diff --git a/sys/miscfs/specfs/spec_vnops.c b/sys/miscfs/specfs/spec_vnops.c index a49a106e1410..cb457d195580 100644 --- a/sys/miscfs/specfs/spec_vnops.c +++ b/sys/miscfs/specfs/spec_vnops.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)spec_vnops.c 8.14 (Berkeley) 5/21/95 - * $Id: spec_vnops.c,v 1.63 1998/06/07 17:11:59 dfr Exp $ + * $Id: spec_vnops.c,v 1.64 1998/07/04 20:45:33 julian Exp $ */ #include <sys/param.h> @@ -183,9 +183,8 @@ spec_open(ap) * opens for writing of any disk character devices. */ if (securelevel >= 2 - && cdevsw[maj]->d_bdev - && (cdevsw[maj]->d_bdev->d_flags & D_TYPEMASK) == - D_DISK) + && cdevsw[maj]->d_bmaj != -1 + && (cdevsw[maj]->d_flags & D_TYPEMASK) == D_DISK) return (EPERM); /* * When running in secure mode, do not allow opens |