Arla client rename from xfs to nnpfs for later upgrades. Tested on various arches. ok todd@ beck@

4 files changed, 22 insertions, 18 deletions

diff --git a/sys/kern/init_sysent.c b/sys/kern/init_sysent.c
index 4b73c0684eb..823f6f88787 100644
--- a/sys/kern/init_sysent.c
+++ b/sys/kern/init_sysent.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: init_sysent.c,v 1.104 2009/03/12 07:04:49 guenther Exp $	*/
+/*	$OpenBSD: init_sysent.c,v 1.105 2009/06/03 14:45:54 jj Exp $	*/
 
 /*
  * System call switch table.
@@ -14,7 +14,7 @@
 #include <sys/syscallargs.h>
 #include <sys/poll.h>
 #include <sys/event.h>
-#include <xfs/xfs_pioctl.h>
+#include <nnpfs/nnpfs_pioctl.h>
 
 #ifdef COMPAT_43
 #define compat_43(func) __CONCAT(compat_43_,func)
@@ -523,8 +523,8 @@ struct sysent sysent[] = {
 	    sys_futimes },			/* 206 = futimes */
 	{ 1, s(struct sys_getpgid_args), 0,
 	    sys_getpgid },			/* 207 = getpgid */
-	{ 5, s(struct sys_xfspioctl_args), 0,
-	    sys_xfspioctl },			/* 208 = xfspioctl */
+	{ 5, s(struct sys_nnpfspioctl_args), 0,
+	    sys_nnpfspioctl },			/* 208 = nnpfspioctl */
 	{ 0, 0, 0,
 	    sys_nosys },			/* 209 = unimplemented */
 #ifdef LKM
diff --git a/sys/kern/syscalls.c b/sys/kern/syscalls.c
index ca9bdd584d5..f25ce401e16 100644
--- a/sys/kern/syscalls.c
+++ b/sys/kern/syscalls.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: syscalls.c,v 1.105 2009/03/12 07:04:49 guenther Exp $	*/
+/*	$OpenBSD: syscalls.c,v 1.106 2009/06/03 14:45:54 jj Exp $	*/
 
 /*
  * System call names.
@@ -251,7 +251,7 @@ char *syscallnames[] = {
 	"#205 (unimplemented sys_undelete)",		/* 205 = unimplemented sys_undelete */
 	"futimes",			/* 206 = futimes */
 	"getpgid",			/* 207 = getpgid */
-	"xfspioctl",			/* 208 = xfspioctl */
+	"nnpfspioctl",			/* 208 = nnpfspioctl */
 	"#209 (unimplemented)",		/* 209 = unimplemented */
 #ifdef LKM
 	"lkmnosys",			/* 210 = lkmnosys */
diff --git a/sys/kern/syscalls.master b/sys/kern/syscalls.master
index 13ac5273a87..75fd31810e2 100644
--- a/sys/kern/syscalls.master
+++ b/sys/kern/syscalls.master
@@ -1,4 +1,4 @@
-;	$OpenBSD: syscalls.master,v 1.91 2009/03/12 06:56:13 guenther Exp $
+;	$OpenBSD: syscalls.master,v 1.92 2009/06/03 14:45:54 jj Exp $
 ;	$NetBSD: syscalls.master,v 1.32 1996/04/23 10:24:21 mycroft Exp $
 
 ;	@(#)syscalls.master	8.2 (Berkeley) 1/13/94
@@ -41,7 +41,7 @@
 #include <sys/syscallargs.h>
 #include <sys/poll.h>
 #include <sys/event.h>
-#include <xfs/xfs_pioctl.h>
+#include <nnpfs/nnpfs_pioctl.h>
 
 ; Reserved/unimplemented system calls in the range 0-150 inclusive
 ; are reserved for use in future Berkeley releases.
@@ -391,9 +391,13 @@
 206	STD		{ int sys_futimes(int fd, \
 			    const struct timeval *tptr); }
 207	STD		{ pid_t sys_getpgid(pid_t pid); }
-208	STD		{ int sys_xfspioctl(int operation, char *a_pathP, \
+#ifdef NNPFS
+208	STD		{ int sys_nnpfspioctl(int operation, char *a_pathP, \
 			    int a_opcode, struct ViceIoctl *a_paramsP, \
 			    int a_followSymlinks); }
+#else
+208	UNIMPL
+#endif
 209	UNIMPL
 ;
 ; Syscalls 210-219 are reserved for dynamically loaded syscalls
diff --git a/sys/kern/vfs_conf.c b/sys/kern/vfs_conf.c
index 3f22882129c..bc50315c89a 100644
--- a/sys/kern/vfs_conf.c
+++ b/sys/kern/vfs_conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vfs_conf.c,v 1.35 2008/05/07 14:08:37 thib Exp $	*/
+/*	$OpenBSD: vfs_conf.c,v 1.36 2009/06/03 14:45:54 jj Exp $	*/
 /*	$NetBSD: vfs_conf.c,v 1.21.4.1 1995/11/01 00:06:26 jtc Exp $	*/
 
 /*
@@ -106,8 +106,8 @@ extern	const struct vfsops cd9660_vfsops;
 extern	const struct vfsops ext2fs_vfsops;
 #endif
 
-#ifdef XFS
-extern  const struct vfsops xfs_vfsops;
+#ifdef NNPFS
+extern  const struct vfsops nnpfs_vfsops;
 #endif
 
 #ifdef NTFS
@@ -151,9 +151,9 @@ static struct vfsconf vfsconflist[] = {
         { &nfs_vfsops, MOUNT_NFS, 2, 0, 0, NULL },
 #endif
 
-	/* XFS */
-#ifdef XFS
-	{ &xfs_vfsops, MOUNT_XFS, 21, 0, 0, NULL },
+	/* NNPFS */
+#ifdef NNPFS
+	{ &nnpfs_vfsops, MOUNT_NNPFS, 21, 0, 0, NULL },
 #endif
 	
         /* /proc Filesystem */
@@ -212,7 +212,7 @@ extern struct vnodeopv_desc msdosfs_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;
+extern struct vnodeopv_desc nnpfs_vnodeop_opv_desc;
 extern struct vnodeopv_desc ntfs_vnodeop_opv_desc;
 extern struct vnodeopv_desc udf_vnodeop_opv_desc;
 
@@ -263,8 +263,8 @@ struct vnodeopv_desc *vfs_opv_descs[] = {
 	&ext2fs_fifoop_opv_desc,
 #endif
 #endif
-#ifdef XFS
-	&xfs_vnodeop_opv_desc,
+#ifdef NNPFS
+	&nnpfs_vnodeop_opv_desc,
 #endif
 #ifdef NTFS
 	&ntfs_vnodeop_opv_desc,