summaryrefslogtreecommitdiff
path: root/sys/ufs
diff options
context:
space:
mode:
authorBruce Evans <bde@FreeBSD.org>1998-10-25 19:02:48 +0000
committerBruce Evans <bde@FreeBSD.org>1998-10-25 19:02:48 +0000
commit9c0619dace8e3fcc8560b1898f37e51a48d852f7 (patch)
treee571eeacb460bb95e98c352797bb5165a5ef296d /sys/ufs
parentf5ef029e9226c3849bdd1100b4ffe4eb60fec3d0 (diff)
Notes
Diffstat (limited to 'sys/ufs')
-rw-r--r--sys/ufs/ffs/ffs_vfsops.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/sys/ufs/ffs/ffs_vfsops.c b/sys/ufs/ffs/ffs_vfsops.c
index 56f20706a611..fbfe118abb05 100644
--- a/sys/ufs/ffs/ffs_vfsops.c
+++ b/sys/ufs/ffs/ffs_vfsops.c
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)ffs_vfsops.c 8.31 (Berkeley) 5/20/95
- * $Id: ffs_vfsops.c,v 1.88 1998/09/26 04:59:42 bde Exp $
+ * $Id: ffs_vfsops.c,v 1.89 1998/10/25 17:44:57 phk Exp $
*/
#include "opt_quota.h"
@@ -290,7 +290,8 @@ ffs_mount( mp, path, data, ndp, p)
err = ENOTBLK;
goto error_2;
}
- if (major(devvp->v_rdev) >= nblkdev) {
+ if (major(devvp->v_rdev) >= nblkdev ||
+ bdevsw[major(devvp->v_rdev)] == NULL) {
err = ENXIO;
goto error_2;
}
@@ -458,7 +459,7 @@ ffs_reload(mp, cred, p)
* Note that it is optional that the backing device be VMIOed. This
* increases the opportunity for metadata caching.
*/
- if ((devvp->v_type == VBLK) && (major(dev) < nblkdev)) {
+ if (devvp->v_type == VBLK) {
simple_lock(&devvp->v_interlock);
vfs_object_create(devvp, p, p->p_ucred, 0);
}
@@ -613,7 +614,7 @@ ffs_mountfs(devvp, mp, p, malloctype)
* Note that it is optional that the backing device be VMIOed. This
* increases the opportunity for metadata caching.
*/
- if ((devvp->v_type == VBLK) && (major(dev) < nblkdev)) {
+ if (devvp->v_type == VBLK) {
simple_lock(&devvp->v_interlock);
vfs_object_create(devvp, p, p->p_ucred, 0);
}