summaryrefslogtreecommitdiffstats
path: root/sys/fs
diff options
context:
space:
mode:
authorphk <phk@FreeBSD.org>1999-08-26 14:53:31 +0000
committerphk <phk@FreeBSD.org>1999-08-26 14:53:31 +0000
commit591c94d4c67807bb48f559afc01b6fb90384559a (patch)
tree73ca4b4fe4032530fe6f8e4ed54f5286fd2242a8 /sys/fs
parent2c6415fbf944c8b04586e326b6d563bbb8c9d06b (diff)
downloadFreeBSD-src-591c94d4c67807bb48f559afc01b6fb90384559a.zip
FreeBSD-src-591c94d4c67807bb48f559afc01b6fb90384559a.tar.gz
Simplify the handling of VCHR and VBLK vnodes using the new dev_t:
Make the alias list a SLIST. Drop the "fast recycling" optimization of vnodes (including the returning of a prexisting but stale vnode from checkalias). It doesn't buy us anything now that we don't hardlimit vnodes anymore. Rename checkalias2() and checkalias() to addalias() and addaliasu() - which takes dev_t and udev_t arg respectively. Make the revoke syscalls use vcount() instead of VALIASED. Remove VALIASED flag, we don't need it now and it is faster to traverse the much shorter lists than to maintain the flag. vfs_mountedon() can check the dev_t directly, all the vnodes point to the same one. Print the devicename in specfs/vprint(). Remove a couple of stale LFS vnode flags. Remove unimplemented/unused LK_DRAINED;
Diffstat (limited to 'sys/fs')
-rw-r--r--sys/fs/cd9660/cd9660_vfsops.c20
-rw-r--r--sys/fs/specfs/spec_vnops.c5
2 files changed, 4 insertions, 21 deletions
diff --git a/sys/fs/cd9660/cd9660_vfsops.c b/sys/fs/cd9660/cd9660_vfsops.c
index 1dc080d..59421d0 100644
--- a/sys/fs/cd9660/cd9660_vfsops.c
+++ b/sys/fs/cd9660/cd9660_vfsops.c
@@ -36,7 +36,7 @@
* SUCH DAMAGE.
*
* @(#)cd9660_vfsops.c 8.18 (Berkeley) 5/22/95
- * $Id: cd9660_vfsops.c,v 1.59 1999/08/23 21:07:12 bde Exp $
+ * $Id: cd9660_vfsops.c,v 1.60 1999/08/25 12:24:39 phk Exp $
*/
#include <sys/param.h>
@@ -892,23 +892,7 @@ cd9660_vget_internal(mp, ino, vpp, relocated, isodir)
* if device, look at device number table for translation
*/
vp->v_op = cd9660_specop_p;
- if ((nvp = checkalias(vp, ip->inode.iso_rdev, mp)) != NULL) {
- /*
- * Discard unneeded vnode, but save its iso_node.
- * Note that the lock is carried over in the iso_node
- * to the replacement vnode.
- */
- nvp->v_data = vp->v_data;
- vp->v_data = NULL;
- vp->v_op = spec_vnodeop_p;
- vrele(vp);
- vgone(vp);
- /*
- * Reinitialize aliased inode.
- */
- vp = nvp;
- ip->i_vnode = vp;
- }
+ addaliasu(vp, ip->inode.iso_rdev);
break;
default:
break;
diff --git a/sys/fs/specfs/spec_vnops.c b/sys/fs/specfs/spec_vnops.c
index d353060..ca1835e 100644
--- a/sys/fs/specfs/spec_vnops.c
+++ b/sys/fs/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.97 1999/08/17 04:02:04 alc Exp $
+ * $Id: spec_vnops.c,v 1.98 1999/08/25 00:26:34 julian Exp $
*/
#include <sys/param.h>
@@ -686,8 +686,7 @@ spec_print(ap)
} */ *ap;
{
- printf("tag VT_NON, dev %d, %d\n", major(ap->a_vp->v_rdev),
- minor(ap->a_vp->v_rdev));
+ printf("tag VT_NON, dev %s\n", devtoname(ap->a_vp->v_rdev));
return (0);
}
OpenPOWER on IntegriCloud