[src/trunk]: src/sys/rump Support fifofs in rump. Do not include it in rumpv...

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

details:   https://anonhg.NetBSD.org/src/rev/e4a90e1e8e95
branches:  trunk
changeset: 753458:e4a90e1e8e95
user:      pooka <pooka%NetBSD.org@localhost>
date:      Mon Mar 29 13:20:31 2010 +0000

description:
Support fifofs in rump.  Do not include it in rumpvfs directly,
since it involves some very non-fs'y components like sockets and
local domain networking.  Also (for better or worse?), call it
rump*v*fs_fifofs instead of rumpfs_fifofs, since it does not really
provide a file system driver.

XXX: uses duplicate common symbols and functionality depends on
link order ... (but at least it works better than before this change)

diffstat:

 sys/rump/fs/Makefile.rumpfs               |   6 +-
 sys/rump/fs/lib/libfifovfs/Makefile       |  11 +++++
 sys/rump/fs/lib/libfifovfs/shlib_version  |   4 +
 sys/rump/librump/rumpvfs/Makefile.rumpvfs |   4 +-
 sys/rump/librump/rumpvfs/vfsops_stub.c    |  63 -------------------------------
 5 files changed, 20 insertions(+), 68 deletions(-)

diffs (123 lines):

diff -r 3ebca86a7083 -r e4a90e1e8e95 sys/rump/fs/Makefile.rumpfs
--- a/sys/rump/fs/Makefile.rumpfs       Mon Mar 29 13:11:32 2010 +0000
+++ b/sys/rump/fs/Makefile.rumpfs       Mon Mar 29 13:20:31 2010 +0000
@@ -1,8 +1,8 @@
-#      $NetBSD: Makefile.rumpfs,v 1.18 2010/03/08 12:30:04 pooka Exp $
+#      $NetBSD: Makefile.rumpfs,v 1.19 2010/03/29 13:20:31 pooka Exp $
 #
 
-RUMPFSLIST=    cd9660 efs ext2fs fdesc ffs hfs lfs mfs msdos nfs nilfs ntfs
-RUMPFSLIST+=   smbfs syspuffs sysvbfs tmpfs udf
+RUMPFSLIST=    cd9660 efs ext2fs fdesc ffs fifovfs hfs lfs mfs msdos
+RUMPFSLIST+=   nfs nilfs ntfs smbfs syspuffs sysvbfs tmpfs udf
 
 .for var in ${RUMPFSLIST}
 RUMPFSLIBS+=lib${var}
diff -r 3ebca86a7083 -r e4a90e1e8e95 sys/rump/fs/lib/libfifovfs/Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/rump/fs/lib/libfifovfs/Makefile       Mon Mar 29 13:20:31 2010 +0000
@@ -0,0 +1,11 @@
+#      $NetBSD: Makefile,v 1.1 2010/03/29 13:20:31 pooka Exp $
+#
+
+.PATH:  ${.CURDIR}/../../../../miscfs/fifofs
+
+LIB=   rumpvfs_fifofs
+
+SRCS=  fifo_vnops.c
+
+.include <bsd.lib.mk>
+.include <bsd.klinks.mk>
diff -r 3ebca86a7083 -r e4a90e1e8e95 sys/rump/fs/lib/libfifovfs/shlib_version
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/rump/fs/lib/libfifovfs/shlib_version  Mon Mar 29 13:20:31 2010 +0000
@@ -0,0 +1,4 @@
+#      $NetBSD: shlib_version,v 1.1 2010/03/29 13:20:31 pooka Exp $
+#
+major=0
+minor=0
diff -r 3ebca86a7083 -r e4a90e1e8e95 sys/rump/librump/rumpvfs/Makefile.rumpvfs
--- a/sys/rump/librump/rumpvfs/Makefile.rumpvfs Mon Mar 29 13:11:32 2010 +0000
+++ b/sys/rump/librump/rumpvfs/Makefile.rumpvfs Mon Mar 29 13:20:31 2010 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.rumpvfs,v 1.25 2010/03/08 12:17:45 pooka Exp $
+#      $NetBSD: Makefile.rumpvfs,v 1.26 2010/03/29 13:20:31 pooka Exp $
 #
 
 .include "${RUMPTOP}/Makefile.rump"
@@ -17,7 +17,7 @@
 # 
 SRCS=  rump_vfs.c devnodes.c devnull.c rumpblk.c rumpfs.c vm_vfs.c
 
-SRCS+= fstrans_stub.c vfsops_stub.c
+SRCS+= fstrans_stub.c
 
 SRCS+= rumpvfs_if_wrappers.c
 
diff -r 3ebca86a7083 -r e4a90e1e8e95 sys/rump/librump/rumpvfs/vfsops_stub.c
--- a/sys/rump/librump/rumpvfs/vfsops_stub.c    Mon Mar 29 13:11:32 2010 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,63 +0,0 @@
-/*     $NetBSD: vfsops_stub.c,v 1.8 2010/03/26 18:21:28 pooka Exp $    */
-
-/*
- * Copyright (c) 2007 Antti Kantee.  All Rights Reserved.
- *
- * Development of this software was supported by Google Summer of Code.
- *
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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: vfsops_stub.c,v 1.8 2010/03/26 18:21:28 pooka Exp $");
-
-#include <sys/param.h>
-#include <sys/errno.h>
-#include <sys/lockf.h>
-#include <sys/systm.h>
-#include <sys/vnode.h>
-
-#include <miscfs/fifofs/fifo.h>
-#include <miscfs/syncfs/syncfs.h>
-
-#define VFSSTUB(name)                                                  \
-    int name(void *arg) {panic("%s: unimplemented vfs stub", __func__);}
-
-/* fifo oops */
-int (**fifo_vnodeop_p)(void *);
-VFSSTUB(fifo_lookup)
-VFSSTUB(fifo_open)
-VFSSTUB(fifo_close)
-VFSSTUB(fifo_ioctl)
-VFSSTUB(fifo_poll)
-VFSSTUB(fifo_kqfilter)
-VFSSTUB(fifo_pathconf)
-VFSSTUB(fifo_bmap)
-VFSSTUB(fifo_read)
-VFSSTUB(fifo_write)
-
-void
-fifo_printinfo(struct vnode *vp)
-{
-
-       return;
-}