glue for xfs

4 files changed, 37 insertions, 4 deletions

diff --git a/sys/conf/files b/sys/conf/files
index cf68926ffef..6eae00fc325 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -1,4 +1,4 @@
-#	$OpenBSD: files,v 1.85 1998/08/27 05:00:09 deraadt Exp $
+#	$OpenBSD: files,v 1.86 1998/08/30 17:11:32 art Exp $
 #	$NetBSD: files,v 1.87 1996/05/19 17:17:50 jonathan Exp $
 
 #	@(#)files.newconf	7.5 (Berkeley) 5/10/93
@@ -452,6 +452,14 @@ file ufs/ext2fs/ext2fs_readwrite.c	ext2fs
 file ufs/ext2fs/ext2fs_subr.c		ext2fs
 file ufs/ext2fs/ext2fs_vfsops.c		ext2fs
 file ufs/ext2fs/ext2fs_vnops.c		ext2fs
+file xfs/xfs_common.c			xfs
+file xfs/xfs_deb.c			xfs
+file xfs/xfs_dev.c			xfs
+file xfs/xfs_message.c			xfs
+file xfs/xfs_node.c			xfs
+file xfs/xfs_syscalls.c			xfs
+file xfs/xfs_vfsops.c			xfs
+file xfs/xfs_vnodeops.c			xfs
 file vm/device_pager.c			devpager
 file vm/swap_pager.c			swappager
 file vm/vm_fault.c
diff --git a/sys/kern/vfs_conf.c b/sys/kern/vfs_conf.c
index cd1a77caba1..502d885b904 100644
--- a/sys/kern/vfs_conf.c
+++ b/sys/kern/vfs_conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vfs_conf.c,v 1.11 1997/12/26 22:33:01 csapuntz Exp $	*/
+/*	$OpenBSD: vfs_conf.c,v 1.12 1998/08/30 17:11:36 art Exp $	*/
 /*	$NetBSD: vfs_conf.c,v 1.21.4.1 1995/11/01 00:06:26 jtc Exp $	*/
 
 /*
@@ -59,6 +59,10 @@
 #include <ufs/mfs/mfs_extern.h>
 #endif
 
+#ifdef XFS
+#include <xfs/xfs_extern.h>
+#endif
+
 #ifdef NFSCLIENT
 #include <nfs/rpcv2.h>
 #include <nfs/nfsproto.h>
@@ -143,6 +147,10 @@ extern 	struct vfsops adosfs_vfsops;
 extern	struct vfsops ext2fs_vfsops;
 #endif
 
+#ifdef XFS
+extern  struct vfsops xfs_vfsops;
+#endif
+
 /*
  * Set up the filesystem operations for vnodes.
  */
@@ -191,6 +199,11 @@ static struct vfsconf vfsconflist[] = {
         { &afs_vfsops, MOUNT_AFS, 13, 0, 0, afs_mountroot, NULL },
 #endif
 
+	/* XFS */
+#ifdef XFS
+	{ &xfs_vfsops, MOUNT_XFS, 21, 0, 0, NULL, NULL },
+#endif
+	
         /* /proc Filesystem */
 #ifdef PROCFS
         { &procfs_vfsops, MOUNT_PROCFS, 12, 0, 0, NULL, NULL },
@@ -271,6 +284,7 @@ extern struct vnodeopv_desc adosfs_vnodeop_opv_desc;
 extern struct vnodeopv_desc ext2fs_vnodeop_opv_desc;
 extern struct vnodeopv_desc ext2fs_specop_opv_desc;
 extern struct vnodeopv_desc ext2fs_fifoop_opv_desc;
+extern struct vnodeopv_desc xfs_vnodeop_opv_desc;
 
 struct vnodeopv_desc *vfs_opv_descs[] = {
 	&sync_vnodeop_opv_desc,
@@ -344,5 +358,8 @@ struct vnodeopv_desc *vfs_opv_descs[] = {
 	&ext2fs_fifoop_opv_desc,
 #endif
 #endif
+#ifdef XFS
+	&xfs_vnodeop_opv_desc,
+#endif
 	NULL
 };
diff --git a/sys/sys/conf.h b/sys/sys/conf.h
index c3d3d60bb0b..d09649190b3 100644
--- a/sys/sys/conf.h
+++ b/sys/sys/conf.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.h,v 1.26 1998/08/24 05:26:49 millert Exp $	*/
+/*	$OpenBSD: conf.h,v 1.27 1998/08/30 17:11:33 art Exp $	*/
 /*	$NetBSD: conf.h,v 1.33 1996/05/03 20:03:32 christos Exp $	*/
 
 /*-
@@ -333,6 +333,13 @@ extern struct cdevsw cdevsw[];
 	(dev_type_stop((*))) enodev, 0, (dev_type_select((*))) enodev, \
 	(dev_type_mmap((*))) enodev }
 
+/* open, close, read, write, ioctl, select */
+#define cdev_xfs_init(c, n) { \
+	dev_init(c,n,open), dev_init(c,n,close), dev_init(c,n,read), \
+	dev_init(c,n,write), dev_init(c,n,ioctl), \
+	(dev_type_stop((*))) enodev, 0, dev_init(c,n,select), \
+	(dev_type_mmap((*))) enodev }
+
 /* open, close, read */
 #define cdev_ksyms_init(c,n) { \
 	dev_init(c,n,open), dev_init(c,n,close), dev_init(c,n,read), \
diff --git a/sys/sys/mount.h b/sys/sys/mount.h
index e2e7f650cec..18e2a568536 100644
--- a/sys/sys/mount.h
+++ b/sys/sys/mount.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mount.h,v 1.22 1998/02/08 22:41:47 tholo Exp $	*/
+/*	$OpenBSD: mount.h,v 1.23 1998/08/30 17:11:34 art Exp $	*/
 /*	$NetBSD: mount.h,v 1.48 1996/02/18 11:55:47 fvdl Exp $	*/
 
 /*
@@ -108,6 +108,7 @@ struct statfs {
 #define	MOUNT_ADOSFS	"adosfs"	/* AmigaDOS Filesystem */
 #define	MOUNT_EXT2FS	"ext2fs"	/* Second Extended Filesystem */
 #define	MOUNT_NCPFS	"ncpfs"		/* NetWare Network File System */
+#define MOUNT_XFS	"xfs"		/* xfs */
 
 /*
  * Structure per mounted file system.  Each mounted file system has an