summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjulian <julian@FreeBSD.org>1997-10-16 07:28:50 +0000
committerjulian <julian@FreeBSD.org>1997-10-16 07:28:50 +0000
commit8d5dbe5c95cf1aa57cf0bf3120d0663ff40ac388 (patch)
tree8b20eafcab2b5c40a8eae4ac972b90a997ac4d16
parent1c62ef985805b57c51bb37842e479c4fa83b64b6 (diff)
downloadFreeBSD-src-8d5dbe5c95cf1aa57cf0bf3120d0663ff40ac388.zip
FreeBSD-src-8d5dbe5c95cf1aa57cf0bf3120d0663ff40ac388.tar.gz
1/ by default make all versions of the same device get the same vnode.
2/ Show the dummy mount in the mount list. it cannot be reached (that I know of) but puting it there, means that disks mounted from devfs will have their things such as the superblock and the bitmaps, synced to disk :)
-rw-r--r--sys/miscfs/devfs/devfs_tree.c4
-rw-r--r--sys/miscfs/devfs/devfs_vfsops.c7
2 files changed, 5 insertions, 6 deletions
diff --git a/sys/miscfs/devfs/devfs_tree.c b/sys/miscfs/devfs/devfs_tree.c
index 8107bc9..cf5aecc 100644
--- a/sys/miscfs/devfs/devfs_tree.c
+++ b/sys/miscfs/devfs/devfs_tree.c
@@ -1,8 +1,8 @@
-#define SPLIT_DEVS 1
+/*#define SPLIT_DEVS 1*/
/*
* Written by Julian Elischer (julian@DIALix.oz.au)
*
- * $Header: /home/ncvs/src/sys/miscfs/devfs/devfs_tree.c,v 1.45 1997/10/12 22:27:11 julian Exp $
+ * $Header: /home/ncvs/src/sys/miscfs/devfs/devfs_tree.c,v 1.46 1997/10/16 06:29:27 julian Exp $
*/
#include "opt_devfs.h"
diff --git a/sys/miscfs/devfs/devfs_vfsops.c b/sys/miscfs/devfs/devfs_vfsops.c
index f6170f2..63f721a 100644
--- a/sys/miscfs/devfs/devfs_vfsops.c
+++ b/sys/miscfs/devfs/devfs_vfsops.c
@@ -1,7 +1,7 @@
/*-
* Written by Julian Elischer (julian@DIALix.oz.au)
*
- * $Header: /home/ncvs/src/sys/miscfs/devfs/devfs_vfsops.c,v 1.22 1997/10/12 20:24:35 phk Exp $
+ * $Header: /home/ncvs/src/sys/miscfs/devfs/devfs_vfsops.c,v 1.23 1997/10/16 06:29:27 julian Exp $
*
*
*/
@@ -36,7 +36,6 @@ devfs_init(struct vfsconf *vfsp)
* we could almost use vfs_rootmountalloc() to do this.
*/
lockinit(&mp->mnt_lock, PVFS, "vfslock", 0, 0);
- (void)vfs_busy(mp, LK_NOWAIT, 0, NULL);
mp->mnt_op = vfsp->vfc_vfsops;
mp->mnt_vfc = vfsp;
mp->mnt_stat.f_type = vfsp->vfc_typenum;
@@ -46,7 +45,7 @@ devfs_init(struct vfsconf *vfsp)
/* Mark a reference for the "invisible" blueprint mount */
mp->mnt_vfc->vfc_refcount++;
- /*CIRCLEQ_INSERT_TAIL(&mountlist, mp, mnt_list);*/
+ CIRCLEQ_INSERT_TAIL(&mountlist, mp, mnt_list);
printf("DEVFS: ready to run\n");
return 0; /*XXX*/
@@ -95,7 +94,7 @@ DBPRINT(("mount "));
return (ENOMEM);
bzero(devfs_mp_p,sizeof(*devfs_mp_p));
devfs_mp_p->mount = mp;
- mp->mnt_data = devfs_mp_p;
+ mp->mnt_data = (void *)devfs_mp_p;
/*-
* Fill out some fields
OpenPOWER on IntegriCloud