[src/trunk]: src/sys/lkm/vfs move sys/lkm/vfs/miscfs/ptyfs/ to sys/lkm/vfs/pt...

[jdolecek <jdolecek%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/d815081be8a5
branches:  trunk
changeset: 571143:d815081be8a5
user:      jdolecek <jdolecek%NetBSD.org@localhost>
date:      Thu Nov 11 19:25:30 2004 +0000

description:
move sys/lkm/vfs/miscfs/ptyfs/ to sys/lkm/vfs/ptyfs/

diffstat:

 sys/lkm/vfs/Makefile                   |   3 +-
 sys/lkm/vfs/miscfs/Makefile            |   4 +-
 sys/lkm/vfs/miscfs/ptyfs/Makefile      |  13 ----
 sys/lkm/vfs/miscfs/ptyfs/lkminit_vfs.c |  98 ----------------------------------
 sys/lkm/vfs/ptyfs/Makefile             |  13 ++++
 sys/lkm/vfs/ptyfs/lkminit_vfs.c        |  98 ++++++++++++++++++++++++++++++++++
 6 files changed, 115 insertions(+), 114 deletions(-)

diffs (266 lines):

diff -r 3a5e1266c95a -r d815081be8a5 sys/lkm/vfs/Makefile
--- a/sys/lkm/vfs/Makefile      Thu Nov 11 19:24:04 2004 +0000
+++ b/sys/lkm/vfs/Makefile      Thu Nov 11 19:25:30 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2004/11/11 19:24:04 jdolecek Exp $
+# $NetBSD: Makefile,v 1.13 2004/11/11 19:25:30 jdolecek Exp $
 
 SUBDIR+=       adosfs
 SUBDIR+=       cd9660
@@ -8,6 +8,7 @@
 SUBDIR+=       miscfs
 SUBDIR+=       msdosfs
 SUBDIR+=       ntfs
+SUBDIR+=       ptyfs
 SUBDIR+=       smbfs
 SUBDIR+=       ufs
 
diff -r 3a5e1266c95a -r d815081be8a5 sys/lkm/vfs/miscfs/Makefile
--- a/sys/lkm/vfs/miscfs/Makefile       Thu Nov 11 19:24:04 2004 +0000
+++ b/sys/lkm/vfs/miscfs/Makefile       Thu Nov 11 19:25:30 2004 +0000
@@ -1,5 +1,5 @@
-#      $NetBSD: Makefile,v 1.6 2004/11/11 01:43:25 christos Exp $
+#      $NetBSD: Makefile,v 1.7 2004/11/11 19:25:30 jdolecek Exp $
 
-SUBDIR=        fdesc kernfs nullfs overlay portal procfs ptyfs umapfs union
+SUBDIR=        fdesc kernfs nullfs overlay portal procfs umapfs union
 
 .include <bsd.subdir.mk>
diff -r 3a5e1266c95a -r d815081be8a5 sys/lkm/vfs/miscfs/ptyfs/Makefile
--- a/sys/lkm/vfs/miscfs/ptyfs/Makefile Thu Nov 11 19:24:04 2004 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-#      $NetBSD: Makefile,v 1.1 2004/11/11 01:43:25 christos Exp $
-
-.include "../Makefile.inc"
-
-.PATH: $S/miscfs/ptyfs ${.CURDIR}/../.. $S/arch/${MACHINE}/${MACHINE} \
-       $S/arch/${MACHINE_CPU}/${MACHINE_CPU}
-
-KMOD=  ptyfs
-
-SRCS=  lkminit_vfs.c
-SRCS+= ptyfs_vfsops.c ptyfs_vnops.c ptyfs_subr.c
-
-.include <bsd.kmod.mk>
diff -r 3a5e1266c95a -r d815081be8a5 sys/lkm/vfs/miscfs/ptyfs/lkminit_vfs.c
--- a/sys/lkm/vfs/miscfs/ptyfs/lkminit_vfs.c    Thu Nov 11 19:24:04 2004 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,98 +0,0 @@
-/* $NetBSD: lkminit_vfs.c,v 1.1 2004/11/11 01:43:25 christos Exp $ */
-
-/*-
- * Copyright (c) 1996 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Michael Graff <explorer%flame.org@localhost>.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *        This product includes software developed by the NetBSD
- *        Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- *    contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lkminit_vfs.c,v 1.1 2004/11/11 01:43:25 christos Exp $");
-
-#include <sys/param.h>
-#include <sys/sysctl.h>
-#include <sys/ioctl.h>
-#include <sys/systm.h>
-#include <sys/conf.h>
-#include <sys/mount.h>
-#include <sys/exec.h>
-#include <sys/lkm.h>
-#include <sys/file.h>
-#include <sys/errno.h>
-
-#include <miscfs/ptyfs/ptyfs.h>
-
-int ptyfs_lkmentry(struct lkm_table *, int, int);
-
-/*
- * This is the vfsops table for the file system in question
- */
-extern struct vfsops ptyfs_vfsops;
-
-/*
- * declare the filesystem
- */
-MOD_VFS("ptyfs", -1, &ptyfs_vfsops);
-
-/*
- * take care of fs specific sysctl nodes
- */
-static int load(struct lkm_table *, int);
-static int unload(struct lkm_table *, int);
-static struct sysctllog *_ptyfs_log;
-
-/*
- * entry point
- */
-int
-ptyfs_lkmentry(struct lkm_table *lkmtp, int cmd, int ver)
-{
-
-       DISPATCH(lkmtp, cmd, ver, load, unload, lkm_nofunc)
-}
-
-static int
-load(struct lkm_table *lkmtp, int cmd)
-{
-
-       sysctl_vfs_ptyfs_setup(&_ptyfs_log);
-       return (0);
-}
-
-static int
-unload(struct lkm_table *lkmtp, int cmd)
-{
-
-       sysctl_teardown(&_ptyfs_log);
-       return (0);
-}
diff -r 3a5e1266c95a -r d815081be8a5 sys/lkm/vfs/ptyfs/Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/lkm/vfs/ptyfs/Makefile        Thu Nov 11 19:25:30 2004 +0000
@@ -0,0 +1,13 @@
+#      $NetBSD: Makefile,v 1.1 2004/11/11 19:25:30 jdolecek Exp $
+
+.include "../Makefile.inc"
+
+.PATH: $S/fs/ptyfs ${.CURDIR}/../.. $S/arch/${MACHINE}/${MACHINE} \
+       $S/arch/${MACHINE_CPU}/${MACHINE_CPU}
+
+KMOD=  ptyfs
+
+SRCS=  lkminit_vfs.c
+SRCS+= ptyfs_vfsops.c ptyfs_vnops.c ptyfs_subr.c
+
+.include <bsd.kmod.mk>
diff -r 3a5e1266c95a -r d815081be8a5 sys/lkm/vfs/ptyfs/lkminit_vfs.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/lkm/vfs/ptyfs/lkminit_vfs.c   Thu Nov 11 19:25:30 2004 +0000
@@ -0,0 +1,98 @@
+/* $NetBSD: lkminit_vfs.c,v 1.1 2004/11/11 19:25:30 jdolecek Exp $ */
+
+/*-
+ * Copyright (c) 1996 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Michael Graff <explorer%flame.org@localhost>.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *        This product includes software developed by the NetBSD
+ *        Foundation, Inc. and its contributors.
+ * 4. Neither the name of The NetBSD Foundation nor the names of its
+ *    contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <sys/cdefs.h>
+__KERNEL_RCSID(0, "$NetBSD: lkminit_vfs.c,v 1.1 2004/11/11 19:25:30 jdolecek Exp $");
+
+#include <sys/param.h>
+#include <sys/sysctl.h>
+#include <sys/ioctl.h>
+#include <sys/systm.h>
+#include <sys/conf.h>
+#include <sys/mount.h>
+#include <sys/exec.h>
+#include <sys/lkm.h>
+#include <sys/file.h>
+#include <sys/errno.h>
+
+#include <fs/ptyfs/ptyfs.h>
+
+int ptyfs_lkmentry(struct lkm_table *, int, int);
+
+/*
+ * This is the vfsops table for the file system in question
+ */
+extern struct vfsops ptyfs_vfsops;
+
+/*
+ * declare the filesystem
+ */
+MOD_VFS("ptyfs", -1, &ptyfs_vfsops);
+
+/*
+ * take care of fs specific sysctl nodes
+ */
+static int load(struct lkm_table *, int);
+static int unload(struct lkm_table *, int);
+static struct sysctllog *_ptyfs_log;
+
+/*
+ * entry point
+ */
+int
+ptyfs_lkmentry(struct lkm_table *lkmtp, int cmd, int ver)
+{
+
+       DISPATCH(lkmtp, cmd, ver, load, unload, lkm_nofunc)
+}
+
+static int
+load(struct lkm_table *lkmtp, int cmd)
+{
+
+       sysctl_vfs_ptyfs_setup(&_ptyfs_log);
+       return (0);
+}
+
+static int
+unload(struct lkm_table *lkmtp, int cmd)
+{
+
+       sysctl_teardown(&_ptyfs_log);
+       return (0);
+}