diff options
| author | Poul-Henning Kamp <phk@FreeBSD.org> | 1999-05-11 19:55:07 +0000 |
|---|---|---|
| committer | Poul-Henning Kamp <phk@FreeBSD.org> | 1999-05-11 19:55:07 +0000 |
| commit | bfbb9ce67005673c7b7c8b2267024adef44f7d1d (patch) | |
| tree | 9ffcbddb82416102ac7aed6b4c9c9b5bf02d13e3 /sys/miscfs | |
| parent | ac9a7ff18c4b3ed2974b52ffccdddff73dfd5cad (diff) | |
Notes
Diffstat (limited to 'sys/miscfs')
| -rw-r--r-- | sys/miscfs/devfs/devfs_vnops.c | 8 | ||||
| -rw-r--r-- | sys/miscfs/kernfs/kernfs_vfsops.c | 3 | ||||
| -rw-r--r-- | sys/miscfs/specfs/spec_vnops.c | 4 | ||||
| -rw-r--r-- | sys/miscfs/specfs/specdev.h | 8 |
4 files changed, 9 insertions, 14 deletions
diff --git a/sys/miscfs/devfs/devfs_vnops.c b/sys/miscfs/devfs/devfs_vnops.c index 55771ec32cb9..7dc94769ee4b 100644 --- a/sys/miscfs/devfs/devfs_vnops.c +++ b/sys/miscfs/devfs/devfs_vnops.c @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: devfs_vnops.c,v 1.72 1999/04/28 11:37:15 phk Exp $ + * $Id: devfs_vnops.c,v 1.73 1999/05/06 20:00:27 phk Exp $ */ @@ -411,15 +411,15 @@ DBPRINT(("getattr\n")); switch (file_node->type) { case DEV_DIR: - vap->va_rdev = (dev_t)file_node->dvm; + vap->va_rdev = (udev_t)file_node->dvm; vap->va_mode |= (S_IFDIR); break; case DEV_CDEV: - vap->va_rdev = file_node->by.Cdev.dev; + vap->va_rdev = dev2udev(file_node->by.Cdev.dev); vap->va_mode |= (S_IFCHR); break; case DEV_BDEV: - vap->va_rdev = file_node->by.Bdev.dev; + vap->va_rdev = dev2udev(file_node->by.Bdev.dev); vap->va_mode |= (S_IFBLK); break; case DEV_SLNK: diff --git a/sys/miscfs/kernfs/kernfs_vfsops.c b/sys/miscfs/kernfs/kernfs_vfsops.c index 44ddd52b4c47..7ae0a35240e0 100644 --- a/sys/miscfs/kernfs/kernfs_vfsops.c +++ b/sys/miscfs/kernfs/kernfs_vfsops.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)kernfs_vfsops.c 8.10 (Berkeley) 5/14/95 - * $Id: kernfs_vfsops.c,v 1.25 1999/05/07 10:11:02 phk Exp $ + * $Id: kernfs_vfsops.c,v 1.26 1999/05/08 06:39:52 phk Exp $ */ /* @@ -79,7 +79,6 @@ static void kernfs_get_rrootdev() { static int tried = 0; - int bmaj = major(rootdev); int cmaj; if (tried) { diff --git a/sys/miscfs/specfs/spec_vnops.c b/sys/miscfs/specfs/spec_vnops.c index 74c30c78d1f0..636bc4453f83 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.84 1999/05/07 10:11:05 phk Exp $ + * $Id: spec_vnops.c,v 1.85 1999/05/08 06:39:55 phk Exp $ */ #include <sys/param.h> @@ -162,7 +162,7 @@ spec_open(ap) { struct proc *p = ap->a_p; struct vnode *bvp, *vp = ap->a_vp; - dev_t bdev, dev = (dev_t)vp->v_rdev; + dev_t bdev, dev = vp->v_rdev; int maj = major(dev); int error; struct cdevsw *dsw; diff --git a/sys/miscfs/specfs/specdev.h b/sys/miscfs/specfs/specdev.h index a7e2bab99a0e..d0cfd774a78c 100644 --- a/sys/miscfs/specfs/specdev.h +++ b/sys/miscfs/specfs/specdev.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)specdev.h 8.6 (Berkeley) 5/21/95 - * $Id: specdev.h,v 1.15 1998/04/19 23:32:29 julian Exp $ + * $Id: specdev.h,v 1.16 1999/02/25 05:22:30 dillon Exp $ */ /* @@ -60,11 +60,7 @@ struct specinfo { * Special device management */ #define SPECHSZ 64 -#if ((SPECHSZ&(SPECHSZ-1)) == 0) -#define SPECHASH(rdev) (((rdev>>5)+(rdev))&(SPECHSZ-1)) -#else -#define SPECHASH(rdev) (((unsigned)((rdev>>5)+(rdev)))%SPECHSZ) -#endif +#define SPECHASH(rdev) (((unsigned)(minor(rdev)))%SPECHSZ) extern struct vnode *speclisth[SPECHSZ]; |