diff options
| author | phk <phk@FreeBSD.org> | 2000-09-05 21:09:56 +0000 |
|---|---|---|
| committer | phk <phk@FreeBSD.org> | 2000-09-05 21:09:56 +0000 |
| commit | 677da8cb2fb7d346b7609a5f62cfcbab0d36b33e (patch) | |
| tree | 32600eef6f1219b9d855222a9ee1607e4e718c8a /sys/kern | |
| parent | 449976b827c4b5ac6104b259837927bec7170f5a (diff) | |
| download | FreeBSD-src-677da8cb2fb7d346b7609a5f62cfcbab0d36b33e.zip FreeBSD-src-677da8cb2fb7d346b7609a5f62cfcbab0d36b33e.tar.gz | |
Move extern declaration of dead_vnodeop_p to a .h file.
Remove race condition in vn_isdisk().
Diffstat (limited to 'sys/kern')
| -rw-r--r-- | sys/kern/vfs_export.c | 8 | ||||
| -rw-r--r-- | sys/kern/vfs_subr.c | 8 |
2 files changed, 10 insertions, 6 deletions
diff --git a/sys/kern/vfs_export.c b/sys/kern/vfs_export.c index 8b11cc3..16a4785 100644 --- a/sys/kern/vfs_export.c +++ b/sys/kern/vfs_export.c @@ -438,7 +438,6 @@ vattr_null(vap) /* * Routines having to do with the management of the vnode table. */ -extern vop_t **dead_vnodeop_p; /* * Return the next vnode from the free list. @@ -2926,6 +2925,8 @@ vn_isdisk(vp, errp) struct vnode *vp; int *errp; { + struct cdevsw *cdevsw; + if (vp->v_type != VBLK && vp->v_type != VCHR) { if (errp != NULL) *errp = ENOTBLK; @@ -2936,12 +2937,13 @@ vn_isdisk(vp, errp) *errp = ENXIO; return (0); } - if (!devsw(vp->v_rdev)) { + cdevsw = devsw(vp->v_rdev); + if (cdevsw == NULL) { if (errp != NULL) *errp = ENXIO; return (0); } - if (!(devsw(vp->v_rdev)->d_flags & D_DISK)) { + if (!(cdevsw->d_flags & D_DISK)) { if (errp != NULL) *errp = ENOTBLK; return (0); diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c index 8b11cc3..16a4785 100644 --- a/sys/kern/vfs_subr.c +++ b/sys/kern/vfs_subr.c @@ -438,7 +438,6 @@ vattr_null(vap) /* * Routines having to do with the management of the vnode table. */ -extern vop_t **dead_vnodeop_p; /* * Return the next vnode from the free list. @@ -2926,6 +2925,8 @@ vn_isdisk(vp, errp) struct vnode *vp; int *errp; { + struct cdevsw *cdevsw; + if (vp->v_type != VBLK && vp->v_type != VCHR) { if (errp != NULL) *errp = ENOTBLK; @@ -2936,12 +2937,13 @@ vn_isdisk(vp, errp) *errp = ENXIO; return (0); } - if (!devsw(vp->v_rdev)) { + cdevsw = devsw(vp->v_rdev); + if (cdevsw == NULL) { if (errp != NULL) *errp = ENXIO; return (0); } - if (!(devsw(vp->v_rdev)->d_flags & D_DISK)) { + if (!(cdevsw->d_flags & D_DISK)) { if (errp != NULL) *errp = ENOTBLK; return (0); |
