d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't follow null bdevsw pointers. The `major(dev) < nblkdev' test rotted

Browse Source 
when bdevsw[] became sparse.  We still depend on magic to avoid having to
check that (v_rdev) device numbers in vnodes are not NODEV.

Removed redundant `major(dev) < nblkdev' tests instead of updating them.
This commit is contained in:
Bruce Evans 1998-10-25 19:02:48 +00:00
parent f5ef029e92
commit 9c0619dace
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sys/ufs/ffs/ffs_vfsops.c
View File

@ -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);
}