From 2c1e28dd9d6598fe4fc7da9abe7173b1a057e1e6 Mon Sep 17 00:00:00 2001
From: Alex Hornung <ahornung@gmail.com>
Date: Mon, 17 Aug 2009 08:24:14 +0100
Subject: [PATCH] DEVFS - move devfs headers to sys/sys; fix consumers

* Move devfs.h and devfs_rules.h from sys/vfs/devfs/ to sys/sys/

* Fix all consumers of the devfs headers to use the new path
---
 sbin/mount_devfs/mount_devfs.c       | 11 +----------
 sys/bus/cam/scsi/scsi_target.c       |  2 +-
 sys/dev/disk/vn/vn.c                 |  2 +-
 sys/dev/misc/snp/snp.c               |  2 +-
 sys/dev/serial/sio/sio.c             |  2 +-
 sys/kern/kern_conf.c                 |  2 +-
 sys/kern/kern_device.c               |  2 +-
 sys/kern/subr_disk.c                 |  2 +-
 sys/kern/subr_diskslice.c            |  2 +-
 sys/kern/tty_pty.c                   |  2 +-
 sys/kern/vfs_conf.c                  |  2 +-
 sys/net/bpf.c                        |  2 +-
 sys/net/tap/if_tap.c                 |  2 +-
 sys/net/tun/if_tun.c                 |  2 +-
 sys/netproto/smb/smb_dev.c           |  2 +-
 sys/{vfs/devfs => sys}/devfs.h       |  6 +++---
 sys/{vfs/devfs => sys}/devfs_rules.h | 10 +++++-----
 sys/vfs/devfs/devfs_core.c           |  4 ++--
 sys/vfs/devfs/devfs_helper.c         |  2 +-
 sys/vfs/devfs/devfs_rules.c          |  4 ++--
 sys/vfs/devfs/devfs_vfsops.c         |  2 +-
 sys/vfs/devfs/devfs_vnops.c          |  2 +-
 usr.sbin/devfsctl/devfsctl.c         |  2 +-
 23 files changed, 31 insertions(+), 40 deletions(-)
 rename sys/{vfs/devfs => sys}/devfs.h (99%)
 rename sys/{vfs/devfs => sys}/devfs_rules.h (95%)

diff --git a/sbin/mount_devfs/mount_devfs.c b/sbin/mount_devfs/mount_devfs.c
index 26e3e448c9..2a23e971bc 100644
--- a/sbin/mount_devfs/mount_devfs.c
+++ b/sbin/mount_devfs/mount_devfs.c
@@ -33,10 +33,7 @@
  */
 #include <sys/param.h>
 #include <sys/mount.h>
-
-#if 0
-#include <vfs/devfs/devfs.h>
-#endif
+#include <sys/devfs.h>
 
 #include <err.h>
 #include <stdio.h>
@@ -47,8 +44,6 @@
 
 #include "mntopts.h"
 
-#define DEVFS_MNT_RULESET	0x01
-#define DEVFS_MNT_JAIL		0x02
 #if 0
 #define MOPT_UPDATE         { "update",     0, MNT_UPDATE, 0 }
 #endif
@@ -68,10 +63,6 @@ struct mntopt mopts[] = {
 
 static void	usage(void);
 
-struct devfs_mount_info {
-	int flags;
-};
-
 int
 main(int argc, char **argv)
 {
diff --git a/sys/bus/cam/scsi/scsi_target.c b/sys/bus/cam/scsi/scsi_target.c
index d483ba05bb..f9850b41f5 100644
--- a/sys/bus/cam/scsi/scsi_target.c
+++ b/sys/bus/cam/scsi/scsi_target.c
@@ -40,7 +40,7 @@
 #include <sys/vnode.h>
 #include <sys/devicestat.h>
 #include <sys/thread2.h>
-#include <vfs/devfs/devfs.h>
+#include <sys/devfs.h>
 
 #include "../cam.h"
 #include "../cam_ccb.h"
diff --git a/sys/dev/disk/vn/vn.c b/sys/dev/disk/vn/vn.c
index c7c1e4227a..92f6242d18 100644
--- a/sys/dev/disk/vn/vn.c
+++ b/sys/dev/disk/vn/vn.c
@@ -83,7 +83,7 @@
 #include <vm/swap_pager.h>
 #include <vm/vm_extern.h>
 #include <vm/vm_zone.h>
-#include <vfs/devfs/devfs.h>
+#include <sys/devfs.h>
 
 static	d_ioctl_t	vnioctl;
 static	d_open_t	vnopen;
diff --git a/sys/dev/misc/snp/snp.c b/sys/dev/misc/snp/snp.c
index 3d742be6ec..5a108e7cfa 100644
--- a/sys/dev/misc/snp/snp.c
+++ b/sys/dev/misc/snp/snp.c
@@ -29,7 +29,7 @@
 #include <sys/thread2.h>
 #include <sys/vnode.h>
 #include <sys/device.h>
-#include <vfs/devfs/devfs.h>
+#include <sys/devfs.h>
 
 static	l_close_t	snplclose;
 static	l_write_t	snplwrite;
diff --git a/sys/dev/serial/sio/sio.c b/sys/dev/serial/sio/sio.c
index dc95110744..dc7b92ceae 100644
--- a/sys/dev/serial/sio/sio.c
+++ b/sys/dev/serial/sio/sio.c
@@ -74,7 +74,7 @@
 #include <sys/rman.h>
 #include <sys/timepps.h>
 #include <sys/thread2.h>
-#include <vfs/devfs/devfs.h>
+#include <sys/devfs.h>
 
 #include <machine/limits.h>
 
diff --git a/sys/kern/kern_conf.c b/sys/kern/kern_conf.c
index 971bfba635..bf9a9f6c9f 100644
--- a/sys/kern/kern_conf.c
+++ b/sys/kern/kern_conf.c
@@ -49,7 +49,7 @@
 
 #include <sys/sysref2.h>
 
-#include <vfs/devfs/devfs.h>
+#include <sys/devfs.h>
 
 MALLOC_DEFINE(M_DEVT, "cdev_t", "dev_t storage");
 
diff --git a/sys/kern/kern_device.c b/sys/kern/kern_device.c
index c87c1c1c0e..246584e69c 100644
--- a/sys/kern/kern_device.c
+++ b/sys/kern/kern_device.c
@@ -47,7 +47,7 @@
 #include <sys/proc.h>
 #include <machine/stdarg.h>
 #include <sys/thread2.h>
-#include <vfs/devfs/devfs.h>
+#include <sys/devfs.h>
 
 /*
  * system link descriptors identify the command in the
diff --git a/sys/kern/subr_disk.c b/sys/kern/subr_disk.c
index fdb75380ec..d4350b9146 100644
--- a/sys/kern/subr_disk.c
+++ b/sys/kern/subr_disk.c
@@ -102,7 +102,7 @@
 #include <sys/msgport.h>
 #include <sys/msgport2.h>
 #include <sys/buf2.h>
-#include <vfs/devfs/devfs.h>
+#include <sys/devfs.h>
 #include <sys/thread.h>
 #include <sys/thread2.h>
 
diff --git a/sys/kern/subr_diskslice.c b/sys/kern/subr_diskslice.c
index 3d572b0e7b..0031cf3e89 100644
--- a/sys/kern/subr_diskslice.c
+++ b/sys/kern/subr_diskslice.c
@@ -68,7 +68,7 @@
 
 #include <vfs/ufs/dinode.h>	/* XXX used only for fs.h */
 #include <vfs/ufs/fs.h>		/* XXX used only to get BBSIZE/SBSIZE */
-#include <vfs/devfs/devfs.h>
+#include <sys/devfs.h>
 
 static int  dsreadandsetlabel(cdev_t dev, u_int flags,
 			   struct diskslices *ssp, struct diskslice *sp,
diff --git a/sys/kern/tty_pty.c b/sys/kern/tty_pty.c
index c2cb3fba3c..e39545cb6c 100644
--- a/sys/kern/tty_pty.c
+++ b/sys/kern/tty_pty.c
@@ -59,7 +59,7 @@
 #include <sys/malloc.h>
 #include <sys/device.h>
 #include <sys/thread2.h>
-#include <vfs/devfs/devfs.h>
+#include <sys/devfs.h>
 
 DEVFS_DECLARE_CLONE_BITMAP(pty);
 DEVFS_DECLARE_CLONE_BITMAP(pts);
diff --git a/sys/kern/vfs_conf.c b/sys/kern/vfs_conf.c
index 807da7fe7b..130d8f38ae 100644
--- a/sys/kern/vfs_conf.c
+++ b/sys/kern/vfs_conf.c
@@ -62,7 +62,7 @@
 #include <sys/paths.h>
 #include <sys/thread2.h>
 #include <sys/nlookup.h>
-#include <vfs/devfs/devfs.h>
+#include <sys/devfs.h>
 
 #include "opt_ddb.h"
 #ifdef DDB
diff --git a/sys/net/bpf.c b/sys/net/bpf.c
index f1920246fa..97cad23e99 100644
--- a/sys/net/bpf.c
+++ b/sys/net/bpf.c
@@ -74,7 +74,7 @@
 #include <sys/kernel.h>
 #include <sys/sysctl.h>
 
-#include <vfs/devfs/devfs.h>
+#include <sys/devfs.h>
 
 struct netmsg_bpf_output {
 	struct netmsg	nm_netmsg;
diff --git a/sys/net/tap/if_tap.c b/sys/net/tap/if_tap.c
index 5ddabb6211..b635a8d115 100644
--- a/sys/net/tap/if_tap.c
+++ b/sys/net/tap/if_tap.c
@@ -67,7 +67,7 @@
 #include <net/if_arp.h>
 #include <net/if_clone.h>
 #include <net/route.h>
-#include <vfs/devfs/devfs.h>
+#include <sys/devfs.h>
 
 #include <netinet/in.h>
 
diff --git a/sys/net/tun/if_tun.c b/sys/net/tun/if_tun.c
index b19ef407c0..f04c15dced 100644
--- a/sys/net/tun/if_tun.c
+++ b/sys/net/tun/if_tun.c
@@ -48,7 +48,7 @@
 #include <net/ifq_var.h>
 #include <net/netisr.h>
 #include <net/route.h>
-#include <vfs/devfs/devfs.h>
+#include <sys/devfs.h>
 
 #ifdef INET
 #include <netinet/in.h>
diff --git a/sys/netproto/smb/smb_dev.c b/sys/netproto/smb/smb_dev.c
index d95a6bb746..9bb7d4fe8d 100644
--- a/sys/netproto/smb/smb_dev.c
+++ b/sys/netproto/smb/smb_dev.c
@@ -49,7 +49,7 @@
 #include <sys/uio.h>
 #include <sys/vnode.h>
 #include <sys/thread2.h>
-#include <vfs/devfs/devfs.h>
+#include <sys/devfs.h>
 #include <net/if.h>
 
 #include "smb.h"
diff --git a/sys/vfs/devfs/devfs.h b/sys/sys/devfs.h
similarity index 99%
rename from sys/vfs/devfs/devfs.h
rename to sys/sys/devfs.h
index 054755882c..84e8677382 100644
--- a/sys/vfs/devfs/devfs.h
+++ b/sys/sys/devfs.h
@@ -31,8 +31,8 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
-#ifndef _VFS_DEVFS_H_
-#define	_VFS_DEVFS_H_
+#ifndef _SYS_DEVFS_H_
+#define	_SYS_DEVFS_H_
 
 #if defined(_KERNEL) || defined(_KERNEL_STRUCTURES)
 
@@ -429,4 +429,4 @@ struct devfs_mount_info {
 	int flags;
 };
 
-#endif /* _VFS_DEVFS_H_ */
+#endif /* _SYS_DEVFS_H_ */
diff --git a/sys/vfs/devfs/devfs_rules.h b/sys/sys/devfs_rules.h
similarity index 95%
rename from sys/vfs/devfs/devfs_rules.h
rename to sys/sys/devfs_rules.h
index ab2ac97f61..05c9733164 100644
--- a/sys/vfs/devfs/devfs_rules.h
+++ b/sys/sys/devfs_rules.h
@@ -31,8 +31,8 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
-#ifndef _VFS_DEVFS_RULES_H_
-#define	_VFS_DEVFS_RULES_H_
+#ifndef _SYS_DEVFS_RULES_H_
+#define	_SYS_DEVFS_RULES_H_
 
 #ifndef _SYS_QUEUE_H_
 #include <sys/queue.h>
@@ -97,8 +97,8 @@ struct devfs_rule_ioctl {
 
 #if defined(_KERNEL) || defined(_KERNEL_STRUCTURES)
 
-#ifndef _VFS_DEVFS_H_
-#include <vfs/devfs/devfs.h>
+#ifndef _SYS_DEVFS_H_
+#include <sys/devfs.h>
 #endif
 
 TAILQ_HEAD(devfs_rule_head, devfs_rule);
@@ -107,4 +107,4 @@ TAILQ_HEAD(devfs_rule_head, devfs_rule);
 void *devfs_rule_check_apply(struct devfs_node *, void *);
 void *devfs_rule_reset_node(struct devfs_node *, void *);
 #endif /* _KERNEL */
-#endif /* _VFS_DEVFS_RULES_H_ */
+#endif /* _SYS_DEVFS_RULES_H_ */
diff --git a/sys/vfs/devfs/devfs_core.c b/sys/vfs/devfs/devfs_core.c
index 1d89d64228..327850661d 100644
--- a/sys/vfs/devfs/devfs_core.c
+++ b/sys/vfs/devfs/devfs_core.c
@@ -46,8 +46,8 @@
 #include <sys/param.h>
 #include <sys/sysref2.h>
 #include <sys/systm.h>
-#include <vfs/devfs/devfs.h>
-#include <vfs/devfs/devfs_rules.h>
+#include <sys/devfs.h>
+#include <sys/devfs_rules.h>
 
 MALLOC_DEFINE(M_DEVFS, "devfs", "Device File System (devfs) allocations");
 DEVFS_DECLARE_CLONE_BITMAP(ops_id);
diff --git a/sys/vfs/devfs/devfs_helper.c b/sys/vfs/devfs/devfs_helper.c
index caff09ee3e..8f3c0e2820 100644
--- a/sys/vfs/devfs/devfs_helper.c
+++ b/sys/vfs/devfs/devfs_helper.c
@@ -37,7 +37,7 @@
 #include <sys/types.h>
 #include <sys/param.h>
 #include <machine/limits.h>
-#include <vfs/devfs/devfs.h>
+#include <sys/devfs.h>
 
 MALLOC_DECLARE(M_DEVFS);
 
diff --git a/sys/vfs/devfs/devfs_rules.c b/sys/vfs/devfs/devfs_rules.c
index 986ddf7109..9a4cf2d784 100644
--- a/sys/vfs/devfs/devfs_rules.c
+++ b/sys/vfs/devfs/devfs_rules.c
@@ -42,8 +42,8 @@
 #include <sys/fcntl.h>
 #include <sys/device.h>
 #include <sys/mount.h>
-#include <vfs/devfs/devfs.h>
-#include <vfs/devfs/devfs_rules.h>
+#include <sys/devfs.h>
+#include <sys/devfs_rules.h>
 
 MALLOC_DECLARE(M_DEVFS);
 
diff --git a/sys/vfs/devfs/devfs_vfsops.c b/sys/vfs/devfs/devfs_vfsops.c
index 8e683bff1b..20793433ea 100644
--- a/sys/vfs/devfs/devfs_vfsops.c
+++ b/sys/vfs/devfs/devfs_vfsops.c
@@ -38,7 +38,7 @@
 #include <sys/vnode.h>
 #include <sys/jail.h>
 #include <sys/lock.h>
-#include <vfs/devfs/devfs.h>
+#include <sys/devfs.h>
 
 MALLOC_DECLARE(M_DEVFS);
 
diff --git a/sys/vfs/devfs/devfs_vnops.c b/sys/vfs/devfs/devfs_vnops.c
index 765784a083..b50c3db5ed 100644
--- a/sys/vfs/devfs/devfs_vnops.c
+++ b/sys/vfs/devfs/devfs_vnops.c
@@ -58,7 +58,7 @@
 #include <sys/ttycom.h>
 #include <sys/sysref2.h>
 #include <sys/tty.h>
-#include <vfs/devfs/devfs.h>
+#include <sys/devfs.h>
 #include <sys/pioctl.h>
 
 #include <machine/limits.h>
diff --git a/usr.sbin/devfsctl/devfsctl.c b/usr.sbin/devfsctl/devfsctl.c
index 099f974905..b787d2f568 100644
--- a/usr.sbin/devfsctl/devfsctl.c
+++ b/usr.sbin/devfsctl/devfsctl.c
@@ -39,7 +39,7 @@
 #include <sys/device.h>
 #include <sys/queue.h>
 #include <sys/stat.h>
-#include <vfs/devfs/devfs_rules.h>
+#include <sys/devfs_rules.h>
 
 #include <ctype.h>
 #include <err.h>
-- 
2.41.0