CVS commit: src/sys/rump/fs/lib/libzfs
Module Name:src
Committed By: christos
Date: Thu Apr 15 17:31:16 UTC 2021
Modified Files:
src/sys/rump/fs/lib/libzfs: Makefile
Log Message:
fix reversed comment
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/rump/fs/lib/libzfs/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/rump/fs/lib/libzfs/Makefile
diff -u src/sys/rump/fs/lib/libzfs/Makefile:1.7 src/sys/rump/fs/lib/libzfs/Makefile:1.8
--- src/sys/rump/fs/lib/libzfs/Makefile:1.7 Sun Sep 6 03:20:30 2020
+++ src/sys/rump/fs/lib/libzfs/Makefile Thu Apr 15 13:31:15 2021
@@ -1,6 +1,10 @@
-# $NetBSD: Makefile,v 1.7 2020/09/06 07:20:30 mrg Exp $
+# $NetBSD: Makefile,v 1.8 2021/04/15 17:31:15 christos Exp $
#
+NEED_ISYSTEM= # Tell rump that we must use -isystem
+
+.include
+
S!= cd ${.PARSEDIR}/../../../../;pwd
.include "${.CURDIR}/../../../../modules/zfs/Makefile.zfsmod"
CVS commit: src/sys/rump/fs/lib/libnofifovfs
Module Name:src
Committed By: christos
Date: Sat May 16 00:43:15 UTC 2020
Added Files:
src/sys/rump/fs/lib/libnofifovfs: Makefile nofifo_vnops.c
Log Message:
PR/55102: Kamil Rytarowski: Duplicate fifo_vnodeop_entries,
fifo_vnodeop_opv_desc symbols.
Missed adding those in previous
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/sys/rump/fs/lib/libnofifovfs/Makefile \
src/sys/rump/fs/lib/libnofifovfs/nofifo_vnops.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: src/sys/rump/fs/lib/libnofifovfs/Makefile
diff -u /dev/null src/sys/rump/fs/lib/libnofifovfs/Makefile:1.1
--- /dev/null Fri May 15 20:43:15 2020
+++ src/sys/rump/fs/lib/libnofifovfs/Makefile Fri May 15 20:43:15 2020
@@ -0,0 +1,10 @@
+# $NetBSD: Makefile,v 1.1 2020/05/16 00:43:15 christos Exp $
+#
+
+LIB= rumpvfs_nofifofs
+COMMENT=File system null FIFO support
+
+SRCS= nofifo_vnops.c
+
+.include
+.include
Index: src/sys/rump/fs/lib/libnofifovfs/nofifo_vnops.c
diff -u /dev/null src/sys/rump/fs/lib/libnofifovfs/nofifo_vnops.c:1.1
--- /dev/null Fri May 15 20:43:15 2020
+++ src/sys/rump/fs/lib/libnofifovfs/nofifo_vnops.c Fri May 15 20:43:15 2020
@@ -0,0 +1,43 @@
+/* $NetBSD: nofifo_vnops.c,v 1.1 2020/05/16 00:43:15 christos Exp $*/
+
+/*
+ * 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
+__KERNEL_RCSID(0, "$NetBSD: nofifo_vnops.c,v 1.1 2020/05/16 00:43:15 christos Exp $");
+
+#include
+#include
+#include
+
+int (**fifo_vnodeop_p)(void *);
+
+const struct vnodeopv_entry_desc fifo_vnodeop_entries[] = {
+ { &vop_default_desc, vn_default_error },
+ { &vop_putpages_desc, genfs_null_putpages },
+ { NULL, NULL }
+};
+
+const struct vnodeopv_desc fifo_vnodeop_opv_desc =
+ { &fifo_vnodeop_p, fifo_vnodeop_entries };
+
CVS commit: src/sys/rump/fs/lib/libffs
Module Name:src
Committed By: christos
Date: Sun Apr 12 00:04:45 UTC 2020
Modified Files:
src/sys/rump/fs/lib/libffs: Makefile
Log Message:
remove removed file
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/sys/rump/fs/lib/libffs/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/rump/fs/lib/libffs/Makefile
diff -u src/sys/rump/fs/lib/libffs/Makefile:1.16 src/sys/rump/fs/lib/libffs/Makefile:1.17
--- src/sys/rump/fs/lib/libffs/Makefile:1.16 Mon Oct 19 12:16:35 2015
+++ src/sys/rump/fs/lib/libffs/Makefile Sat Apr 11 20:04:45 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2015/10/19 16:16:35 pooka Exp $
+# $NetBSD: Makefile,v 1.17 2020/04/12 00:04:45 christos Exp $
#
.PATH: ${.CURDIR}/../../../../ufs/ffs ${.CURDIR}/../../../../ufs/ufs
@@ -11,7 +11,7 @@ SRCS= ffs_alloc.c ffs_appleufs.c ffs_bal
ffs_wapbl.c ffs_quota2.c
SRCS+= ufs_bmap.c ufs_dirhash.c ufs_extattr.c ufs_inode.c \
- ufs_lookup.c ufs_rename.c ufs_vfsops.c ufs_vnops.c ufs_wapbl.c \
+ ufs_lookup.c ufs_rename.c ufs_vfsops.c ufs_vnops.c \
ufs_quota.c ufs_quota2.c quota2_subr.c
CPPFLAGS+= -DFFS_EI -DUFS_DIRHASH -DWAPBL -DAPPLE_UFS -DUFS_EXTATTR \
CVS commit: src/sys/rump/fs/lib/liblfs
Module Name:src
Committed By: riastradh
Date: Sat Mar 21 18:58:43 UTC 2020
Modified Files:
src/sys/rump/fs/lib/liblfs: Makefile
Log Message:
Suppress spurious address-of-packed error in rump lfs too.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/rump/fs/lib/liblfs/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/rump/fs/lib/liblfs/Makefile
diff -u src/sys/rump/fs/lib/liblfs/Makefile:1.14 src/sys/rump/fs/lib/liblfs/Makefile:1.15
--- src/sys/rump/fs/lib/liblfs/Makefile:1.14 Wed Mar 23 21:38:51 2016
+++ src/sys/rump/fs/lib/liblfs/Makefile Sat Mar 21 18:58:43 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2016/03/23 21:38:51 christos Exp $
+# $NetBSD: Makefile,v 1.15 2020/03/21 18:58:43 riastradh Exp $
#
.PATH: ${.CURDIR}/../../../../ufs/lfs
@@ -21,5 +21,10 @@ CFLAGS+=-DLFS_KERNEL_RFW
COPTS.lfs_inode.c+=-O0
.endif
+# Follow the suit of Makefile.kern.inc; needed for the lfs64 union
+# accessors -- they don't actually dereference the resulting pointer,
+# just use it for type-checking.
+CWARNFLAGS.clang+= -Wno-error=address-of-packed-member
+
.include
.include
CVS commit: src/sys/rump/fs/lib/libext2fs
Module Name:src
Committed By: martin
Date: Fri Aug 12 20:25:34 UTC 2016
Modified Files:
src/sys/rump/fs/lib/libext2fs: Makefile
Log Message:
Add new file to fix the build.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/rump/fs/lib/libext2fs/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/rump/fs/lib/libext2fs/Makefile
diff -u src/sys/rump/fs/lib/libext2fs/Makefile:1.7 src/sys/rump/fs/lib/libext2fs/Makefile:1.8
--- src/sys/rump/fs/lib/libext2fs/Makefile:1.7 Fri Jun 24 21:31:30 2016
+++ src/sys/rump/fs/lib/libext2fs/Makefile Fri Aug 12 20:25:34 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2016/06/24 21:31:30 christos Exp $
+# $NetBSD: Makefile,v 1.8 2016/08/12 20:25:34 martin Exp $
#
.PATH: ${.CURDIR}/../../../../ufs/ext2fs
@@ -9,7 +9,8 @@ COMMENT=Linux Ext2
SRCS= ext2fs_alloc.c ext2fs_balloc.c ext2fs_bmap.c ext2fs_bswap.c \
ext2fs_hash.c ext2fs_htree.c \
ext2fs_extents.c ext2fs_inode.c ext2fs_lookup.c ext2fs_readwrite.c \
- ext2fs_rename.c ext2fs_subr.c ext2fs_vfsops.c ext2fs_vnops.c
+ ext2fs_rename.c ext2fs_subr.c ext2fs_vfsops.c ext2fs_vnops.c \
+ ext2fs_xattr.c
.include
.include
CVS commit: src/sys/rump/fs/lib/libext2fs
Module Name:src
Committed By: christos
Date: Fri Jun 24 21:31:30 UTC 2016
Modified Files:
src/sys/rump/fs/lib/libext2fs: Makefile
Log Message:
Add new files
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/rump/fs/lib/libext2fs/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/rump/fs/lib/libext2fs/Makefile
diff -u src/sys/rump/fs/lib/libext2fs/Makefile:1.6 src/sys/rump/fs/lib/libext2fs/Makefile:1.7
--- src/sys/rump/fs/lib/libext2fs/Makefile:1.6 Fri Jun 3 17:55:50 2016
+++ src/sys/rump/fs/lib/libext2fs/Makefile Fri Jun 24 17:31:30 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2016/06/03 21:55:50 joerg Exp $
+# $NetBSD: Makefile,v 1.7 2016/06/24 21:31:30 christos Exp $
#
.PATH: ${.CURDIR}/../../../../ufs/ext2fs
@@ -7,6 +7,7 @@ LIB= rumpfs_ext2fs
COMMENT=Linux Ext2
SRCS= ext2fs_alloc.c ext2fs_balloc.c ext2fs_bmap.c ext2fs_bswap.c \
+ ext2fs_hash.c ext2fs_htree.c \
ext2fs_extents.c ext2fs_inode.c ext2fs_lookup.c ext2fs_readwrite.c \
ext2fs_rename.c ext2fs_subr.c ext2fs_vfsops.c ext2fs_vnops.c
CVS commit: src/sys/rump/fs/lib/liblfs
Module Name:src
Committed By: christos
Date: Wed Mar 23 21:38:51 UTC 2016
Modified Files:
src/sys/rump/fs/lib/liblfs: Makefile
Log Message:
elide vax compiler bug.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/rump/fs/lib/liblfs/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/rump/fs/lib/liblfs/Makefile
diff -u src/sys/rump/fs/lib/liblfs/Makefile:1.13 src/sys/rump/fs/lib/liblfs/Makefile:1.14
--- src/sys/rump/fs/lib/liblfs/Makefile:1.13 Mon Oct 19 12:16:36 2015
+++ src/sys/rump/fs/lib/liblfs/Makefile Wed Mar 23 17:38:51 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2015/10/19 16:16:36 pooka Exp $
+# $NetBSD: Makefile,v 1.14 2016/03/23 21:38:51 christos Exp $
#
.PATH: ${.CURDIR}/../../../../ufs/lfs
@@ -17,6 +17,9 @@ SRCS+= ulfs_bmap.c ulfs_dirhash.c ulfs_e
CFLAGS+=-DLFS_KERNEL_RFW
+.if ${MACHINE_ARCH} == "vax"
+COPTS.lfs_inode.c+=-O0
+.endif
.include
.include
CVS commit: src/sys/rump/fs/lib/libnfs
Module Name:src
Committed By: pooka
Date: Mon Aug 24 23:19:33 UTC 2015
Modified Files:
src/sys/rump/fs/lib/libnfs: Makefile
Log Message:
don't -I imaginary opt directories
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/rump/fs/lib/libnfs/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/rump/fs/lib/libnfs/Makefile
diff -u src/sys/rump/fs/lib/libnfs/Makefile:1.11 src/sys/rump/fs/lib/libnfs/Makefile:1.12
--- src/sys/rump/fs/lib/libnfs/Makefile:1.11 Tue Mar 2 23:37:16 2010
+++ src/sys/rump/fs/lib/libnfs/Makefile Mon Aug 24 23:19:33 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2010/03/02 23:37:16 pooka Exp $
+# $NetBSD: Makefile,v 1.12 2015/08/24 23:19:33 pooka Exp $
#
.PATH: ${.CURDIR}/../../../../nfs
@@ -9,8 +9,6 @@ SRCS= krpc_subr.c nfs_bio.c nfs_boot.c n
nfs_socket.c nfs_clntsocket.c nfs_clntsubs.c nfs_subs.c \
nfs_iod.c nfs_vfsops.c nfs_vnops.c nfs_bootdhcp.c nfs_bootparam.c
-CPPFLAGS+= -I${.CURDIR}/../../../net/lib/libnet/opt
-CPPFLAGS+= -I${.CURDIR}/../../../net/lib/libnetinet/opt
CPPFLAGS+= -DNFS_BOOT_DHCP -DNFS_BOOT_BOOTPARAM
.include
CVS commit: src/sys/rump/fs/lib/libnfs
Module Name:src Committed By: pooka Date: Fri Aug 21 12:45:10 UTC 2015 Removed Files: src/sys/rump/fs/lib/libnfs: opt_nfs.h opt_nfs_boot.h opt_nfsserver.h opt_tftproot.h opt_uvmhist.h Log Message: kill now-unnecessary empty opt files (_KERNEL_OPT'ed probably eons ago) To generate a diff of this commit: cvs rdiff -u -r1.1 -r0 src/sys/rump/fs/lib/libnfs/opt_nfs.h \ src/sys/rump/fs/lib/libnfs/opt_nfs_boot.h \ src/sys/rump/fs/lib/libnfs/opt_nfsserver.h \ src/sys/rump/fs/lib/libnfs/opt_tftproot.h \ src/sys/rump/fs/lib/libnfs/opt_uvmhist.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/rump/fs/lib/libsyspuffs
Module Name:src Committed By: christos Date: Sun May 10 14:05:22 UTC 2015 Modified Files: src/sys/rump/fs/lib/libsyspuffs: puffs_rumpglue.c Log Message: PR/975220: Check return of kthread_create To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/sys/rump/fs/lib/libsyspuffs/puffs_rumpglue.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/rump/fs/lib/libsyspuffs/puffs_rumpglue.c diff -u src/sys/rump/fs/lib/libsyspuffs/puffs_rumpglue.c:1.14 src/sys/rump/fs/lib/libsyspuffs/puffs_rumpglue.c:1.15 --- src/sys/rump/fs/lib/libsyspuffs/puffs_rumpglue.c:1.14 Sun May 10 10:00:42 2015 +++ src/sys/rump/fs/lib/libsyspuffs/puffs_rumpglue.c Sun May 10 10:05:22 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: puffs_rumpglue.c,v 1.14 2015/05/10 14:00:42 christos Exp $ */ +/* $NetBSD: puffs_rumpglue.c,v 1.15 2015/05/10 14:05:22 christos Exp $ */ /* * Copyright (c) 2008 Antti Kantee. All Rights Reserved. @@ -29,7 +29,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: puffs_rumpglue.c,v 1.14 2015/05/10 14:00:42 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: puffs_rumpglue.c,v 1.15 2015/05/10 14:05:22 christos Exp $"); #include #include @@ -197,8 +197,15 @@ rump_syspuffs_glueinit(int fd, int *newf pap->fpfd = curlwp->l_dupfd; pap->fdp = curlwp->l_proc->p_fd; - kthread_create(PRI_NONE, 0, NULL, readthread, pap, NULL, "rputter"); - kthread_create(PRI_NONE, 0, NULL, writethread, pap, NULL, "wputter"); + rv = kthread_create(PRI_NONE, 0, NULL, readthread, pap, NULL, + "rputter"); + if (rv) + return rv; + + rv = kthread_create(PRI_NONE, 0, NULL, writethread, pap, NULL, + "wputter"); + if (rv) + return rv; *newfd = curlwp->l_dupfd; return 0;
CVS commit: src/sys/rump/fs/lib/libsyspuffs
Module Name:src
Committed By: christos
Date: Sun May 10 14:00:42 UTC 2015
Modified Files:
src/sys/rump/fs/lib/libsyspuffs: puffs_rumpglue.c
Log Message:
CID 274829: Check error from fd_getfile to avoid NULL deref immediately
after.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/rump/fs/lib/libsyspuffs/puffs_rumpglue.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/rump/fs/lib/libsyspuffs/puffs_rumpglue.c
diff -u src/sys/rump/fs/lib/libsyspuffs/puffs_rumpglue.c:1.13 src/sys/rump/fs/lib/libsyspuffs/puffs_rumpglue.c:1.14
--- src/sys/rump/fs/lib/libsyspuffs/puffs_rumpglue.c:1.13 Mon Apr 29 20:03:53 2013
+++ src/sys/rump/fs/lib/libsyspuffs/puffs_rumpglue.c Sun May 10 10:00:42 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: puffs_rumpglue.c,v 1.13 2013/04/30 00:03:53 pooka Exp $ */
+/* $NetBSD: puffs_rumpglue.c,v 1.14 2015/05/10 14:00:42 christos Exp $ */
/*
* Copyright (c) 2008 Antti Kantee. All Rights Reserved.
@@ -29,7 +29,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: puffs_rumpglue.c,v 1.13 2013/04/30 00:03:53 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: puffs_rumpglue.c,v 1.14 2015/05/10 14:00:42 christos Exp $");
#include
#include
@@ -85,8 +85,11 @@ readthread(void *arg)
off = 0;
fp = fd_getfile(pap->fpfd);
- error = dofileread(pap->fpfd, fp, buf, BUFSIZE,
- &off, 0, &rv);
+ if (fp == NULL)
+ error = EINVAL;
+ else
+ error = dofileread(pap->fpfd, fp, buf, BUFSIZE,
+ &off, 0, &rv);
if (error) {
if (error == ENOENT && inited == 0)
goto retry;
@@ -161,8 +164,11 @@ writethread(void *arg)
off = 0;
rv = 0;
fp = fd_getfile(pap->fpfd);
- error = dofilewrite(pap->fpfd, fp, buf, phdr->pth_framelen,
- &off, 0, &rv);
+ if (fp == NULL)
+ error = EINVAL;
+ else
+ error = dofilewrite(pap->fpfd, fp, buf,
+ phdr->pth_framelen, &off, 0, &rv);
if (error == ENXIO)
goto out;
KASSERT(rv == phdr->pth_framelen);
CVS commit: src/sys/rump/fs/lib/libsyspuffs
Module Name:src
Committed By: pooka
Date: Thu Mar 13 01:45:33 UTC 2014
Modified Files:
src/sys/rump/fs/lib/libsyspuffs: Makefile
Added Files:
src/sys/rump/fs/lib/libsyspuffs: syspuffs_component.c
Removed Files:
src/sys/rump/fs/lib/libsyspuffs: component.c
Log Message:
rename component.c -> syspuffs_component.c
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/rump/fs/lib/libsyspuffs/Makefile
cvs rdiff -u -r1.1 -r0 src/sys/rump/fs/lib/libsyspuffs/component.c
cvs rdiff -u -r0 -r1.1 src/sys/rump/fs/lib/libsyspuffs/syspuffs_component.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/rump/fs/lib/libsyspuffs/Makefile
diff -u src/sys/rump/fs/lib/libsyspuffs/Makefile:1.7 src/sys/rump/fs/lib/libsyspuffs/Makefile:1.8
--- src/sys/rump/fs/lib/libsyspuffs/Makefile:1.7 Tue Jul 6 16:13:57 2010
+++ src/sys/rump/fs/lib/libsyspuffs/Makefile Thu Mar 13 01:45:33 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2010/07/06 16:13:57 pooka Exp $
+# $NetBSD: Makefile,v 1.8 2014/03/13 01:45:33 pooka Exp $
#
.PATH: ${.CURDIR}/../../../../fs/puffs
@@ -9,7 +9,8 @@ SRCS= puffs_msgif.c puffs_node.c puffs_s
SRCS+= puffs_compat.c
SRCS+= puffs_rumpglue.c
-SRCS+= component.c
+
+SRCS+= syspuffs_component.c
CPPFLAGS+= -DPUFFSDEBUG -I${RUMPTOP}/librump/rumpvfs
CPPFLAGS+= -I${RUMPTOP}/librump/rumpkern
Added files:
Index: src/sys/rump/fs/lib/libsyspuffs/syspuffs_component.c
diff -u /dev/null src/sys/rump/fs/lib/libsyspuffs/syspuffs_component.c:1.1
--- /dev/null Thu Mar 13 01:45:33 2014
+++ src/sys/rump/fs/lib/libsyspuffs/syspuffs_component.c Thu Mar 13 01:45:33 2014
@@ -0,0 +1,44 @@
+/* $NetBSD: syspuffs_component.c,v 1.1 2014/03/13 01:45:33 pooka Exp $ */
+
+/*
+ * Copyright (c) 2010 Antti Kantee. All Rights Reserved.
+ *
+ * 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
+__KERNEL_RCSID(0, "$NetBSD: syspuffs_component.c,v 1.1 2014/03/13 01:45:33 pooka Exp $");
+
+#include
+#include
+#include
+#include
+#include
+#include
+
+#include "rump_private.h"
+
+RUMP_COMPONENT(RUMP_COMPONENT_VFS)
+{
+
+ FLAWLESSCALL(do_sys_symlink("putter", "/dev/puffs", UIO_SYSSPACE));
+}
CVS commit: src/sys/rump/fs/lib/libzfs
Module Name:src
Committed By: pooka
Date: Thu Mar 13 01:46:10 UTC 2014
Modified Files:
src/sys/rump/fs/lib/libzfs: Makefile
Added Files:
src/sys/rump/fs/lib/libzfs: zfs_component.c
Removed Files:
src/sys/rump/fs/lib/libzfs: component.c
Log Message:
rename component.c -> zfs_component.c
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/rump/fs/lib/libzfs/Makefile
cvs rdiff -u -r1.6 -r0 src/sys/rump/fs/lib/libzfs/component.c
cvs rdiff -u -r0 -r1.1 src/sys/rump/fs/lib/libzfs/zfs_component.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/rump/fs/lib/libzfs/Makefile
diff -u src/sys/rump/fs/lib/libzfs/Makefile:1.3 src/sys/rump/fs/lib/libzfs/Makefile:1.4
--- src/sys/rump/fs/lib/libzfs/Makefile:1.3 Thu Mar 10 19:24:37 2011
+++ src/sys/rump/fs/lib/libzfs/Makefile Thu Mar 13 01:46:10 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2011/03/10 19:24:37 pooka Exp $
+# $NetBSD: Makefile,v 1.4 2014/03/13 01:46:10 pooka Exp $
#
S!= cd ${.PARSEDIR}/../../../../;pwd
@@ -11,7 +11,7 @@ LIB= rumpfs_zfs
CPPFLAGS+= -I${RUMPTOP}/librump/rumpkern -I${RUMPTOP}/librump/rumpvfs\
-I${RUMPTOP}/librump/rumpdev
-SRCS+= component.c
+SRCS+= zfs_component.c
.include
.include
Added files:
Index: src/sys/rump/fs/lib/libzfs/zfs_component.c
diff -u /dev/null src/sys/rump/fs/lib/libzfs/zfs_component.c:1.1
--- /dev/null Thu Mar 13 01:46:10 2014
+++ src/sys/rump/fs/lib/libzfs/zfs_component.c Thu Mar 13 01:46:10 2014
@@ -0,0 +1,57 @@
+/* $NetBSD: zfs_component.c,v 1.1 2014/03/13 01:46:10 pooka Exp $ */
+
+/*
+ * Copyright (c) 2009 Antti Kantee. All Rights Reserved.
+ *
+ * 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
+__KERNEL_RCSID(0, "$NetBSD: zfs_component.c,v 1.1 2014/03/13 01:46:10 pooka Exp $");
+
+#include
+#include
+#include
+#include
+
+#include "rump_private.h"
+#include "rump_vfs_private.h"
+
+RUMP_COMPONENT(RUMP_COMPONENT_VFS)
+{
+ extern const struct bdevsw zfs_bdevsw;
+ extern const struct cdevsw zfs_cdevsw;
+ devmajor_t bmaj, cmaj;
+ int error;
+
+ /* go, mydevfs */
+ bmaj = cmaj = -1;
+
+ if ((error = devsw_attach("zfs", &zfs_bdevsw, &bmaj,
+ &zfs_cdevsw, &cmaj)) != 0 && error != EEXIST)
+ panic("cannot attach zfs: %d", error);
+
+ if ((error = rump_vfs_makeonedevnode(S_IFCHR,
+ "/dev/zfs", cmaj, 0)) != 0)
+ panic("cannot create zfs dev nodes: %d", error);
+ devsw_detach(&zfs_bdevsw, &zfs_cdevsw);
+}
CVS commit: src/sys/rump/fs/lib/liblfs
Module Name:src
Committed By: dholland
Date: Sat Jul 20 20:43:09 UTC 2013
Modified Files:
src/sys/rump/fs/lib/liblfs: Makefile
Log Message:
why does rump have to have its own private build system?
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/rump/fs/lib/liblfs/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/rump/fs/lib/liblfs/Makefile
diff -u src/sys/rump/fs/lib/liblfs/Makefile:1.8 src/sys/rump/fs/lib/liblfs/Makefile:1.9
--- src/sys/rump/fs/lib/liblfs/Makefile:1.8 Sat Jun 8 22:45:28 2013
+++ src/sys/rump/fs/lib/liblfs/Makefile Sat Jul 20 20:43:09 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2013/06/08 22:45:28 dholland Exp $
+# $NetBSD: Makefile,v 1.9 2013/07/20 20:43:09 dholland Exp $
#
.PATH: ${.CURDIR}/../../../../ufs/lfs
@@ -6,13 +6,13 @@
LIB= rumpfs_lfs
SRCS= lfs_alloc.c lfs_balloc.c lfs_bio.c lfs_cksum.c lfs_debug.c \
- lfs_inode.c lfs_itimes.c lfs_rfw.c lfs_segment.c lfs_subr.c \
- lfs_syscalls.c lfs_vfsops.c lfs_vnops.c
+ lfs_inode.c lfs_itimes.c lfs_rename.c lfs_rfw.c lfs_segment.c \
+ lfs_subr.c lfs_syscalls.c lfs_vfsops.c lfs_vnops.c
SRCS+= ulfs_bmap.c ulfs_dirhash.c ulfs_extattr.c ulfs_ihash.c \
ulfs_inode.c ulfs_lookup.c ulfs_quota.c ulfs_quota1.c \
ulfs_quota2.c ulfs_quota1_subr.c ulfs_quota2_subr.c \
- ulfs_rename.c ulfs_snapshot.c ulfs_vfsops.c ulfs_vnops.c
+ ulfs_snapshot.c ulfs_vfsops.c ulfs_vnops.c
CFLAGS+=-DLFS_KERNEL_RFW
CVS commit: src/sys/rump/fs/lib/libudf
Module Name:src
Committed By: reinoud
Date: Wed Jul 10 16:47:18 UTC 2013
Modified Files:
src/sys/rump/fs/lib/libudf: Makefile
Log Message:
Oops forgot the rump addition of udf_rename.c
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/rump/fs/lib/libudf/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/rump/fs/lib/libudf/Makefile
diff -u src/sys/rump/fs/lib/libudf/Makefile:1.7 src/sys/rump/fs/lib/libudf/Makefile:1.8
--- src/sys/rump/fs/lib/libudf/Makefile:1.7 Thu May 26 12:56:32 2011
+++ src/sys/rump/fs/lib/libudf/Makefile Wed Jul 10 16:47:17 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2011/05/26 12:56:32 joerg Exp $
+# $NetBSD: Makefile,v 1.8 2013/07/10 16:47:17 reinoud Exp $
#
.PATH: ${.CURDIR}/../../../../fs/udf
@@ -7,7 +7,8 @@ LIB= rumpfs_udf
SRCS= udf_osta.c udf_vfsops.c udf_vnops.c udf_subr.c \
udf_allocation.c udf_readwrite.c udf_strat_bootstrap.c \
- udf_strat_direct.c udf_strat_sequential.c udf_strat_rmw.c
+ udf_strat_direct.c udf_strat_sequential.c udf_strat_rmw.c \
+ udf_rename.c
CWARNFLAGS.clang+= -Wno-self-assign
CVS commit: src/sys/rump/fs/lib/liblfs
Module Name:src
Committed By: dholland
Date: Sat Jun 8 22:45:29 UTC 2013
Modified Files:
src/sys/rump/fs/lib/liblfs: Makefile
Log Message:
right, why does rump have to have its own copy of all the build information?
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/rump/fs/lib/liblfs/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/rump/fs/lib/liblfs/Makefile
diff -u src/sys/rump/fs/lib/liblfs/Makefile:1.7 src/sys/rump/fs/lib/liblfs/Makefile:1.8
--- src/sys/rump/fs/lib/liblfs/Makefile:1.7 Thu Jun 6 00:54:49 2013
+++ src/sys/rump/fs/lib/liblfs/Makefile Sat Jun 8 22:45:28 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2013/06/06 00:54:49 dholland Exp $
+# $NetBSD: Makefile,v 1.8 2013/06/08 22:45:28 dholland Exp $
#
.PATH: ${.CURDIR}/../../../../ufs/lfs
@@ -12,8 +12,7 @@ SRCS= lfs_alloc.c lfs_balloc.c lfs_bio.c
SRCS+= ulfs_bmap.c ulfs_dirhash.c ulfs_extattr.c ulfs_ihash.c \
ulfs_inode.c ulfs_lookup.c ulfs_quota.c ulfs_quota1.c \
ulfs_quota2.c ulfs_quota1_subr.c ulfs_quota2_subr.c \
- ulfs_rename.c ulfs_snapshot.c ulfs_vfsops.c ulfs_vnops.c \
- ulfs_wapbl.c
+ ulfs_rename.c ulfs_snapshot.c ulfs_vfsops.c ulfs_vnops.c
CFLAGS+=-DLFS_KERNEL_RFW
CVS commit: src/sys/rump/fs/lib/libzfs
Module Name:src
Committed By: christos
Date: Sun Mar 10 04:24:16 UTC 2013
Modified Files:
src/sys/rump/fs/lib/libzfs: component.c
Log Message:
Now that the auto-loading zfs bug has been fixed, the loading failed because
the devsw node was busied here. Since we load the devsw only for the purpose
of creating the device node in our virtual filesystem, detach it after we
are done so that the real module can reload it.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/rump/fs/lib/libzfs/component.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/rump/fs/lib/libzfs/component.c
diff -u src/sys/rump/fs/lib/libzfs/component.c:1.5 src/sys/rump/fs/lib/libzfs/component.c:1.6
--- src/sys/rump/fs/lib/libzfs/component.c:1.5 Thu Mar 10 17:11:05 2011
+++ src/sys/rump/fs/lib/libzfs/component.c Sat Mar 9 23:24:16 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: component.c,v 1.5 2011/03/10 22:11:05 wiz Exp $ */
+/* $NetBSD: component.c,v 1.6 2013/03/10 04:24:16 christos Exp $ */
/*
* Copyright (c) 2009 Antti Kantee. All Rights Reserved.
@@ -26,7 +26,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: component.c,v 1.5 2011/03/10 22:11:05 wiz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: component.c,v 1.6 2013/03/10 04:24:16 christos Exp $");
#include
#include
@@ -53,4 +53,5 @@ RUMP_COMPONENT(RUMP_COMPONENT_VFS)
if ((error = rump_vfs_makeonedevnode(S_IFCHR,
"/dev/zfs", cmaj, 0)) != 0)
panic("cannot create zfs dev nodes: %d", error);
+ devsw_detach(&zfs_bdevsw, &zfs_cdevsw);
}
CVS commit: src/sys/rump/fs/lib/libzfs
Module Name:src
Committed By: wiz
Date: Thu Mar 10 22:11:05 UTC 2011
Modified Files:
src/sys/rump/fs/lib/libzfs: component.c
Log Message:
When panicing, at least tell the _real_ reason.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/rump/fs/lib/libzfs/component.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/rump/fs/lib/libzfs/component.c
diff -u src/sys/rump/fs/lib/libzfs/component.c:1.4 src/sys/rump/fs/lib/libzfs/component.c:1.5
--- src/sys/rump/fs/lib/libzfs/component.c:1.4 Thu Mar 10 19:24:37 2011
+++ src/sys/rump/fs/lib/libzfs/component.c Thu Mar 10 22:11:05 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: component.c,v 1.4 2011/03/10 19:24:37 pooka Exp $ */
+/* $NetBSD: component.c,v 1.5 2011/03/10 22:11:05 wiz Exp $ */
/*
* Copyright (c) 2009 Antti Kantee. All Rights Reserved.
@@ -26,7 +26,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: component.c,v 1.4 2011/03/10 19:24:37 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: component.c,v 1.5 2011/03/10 22:11:05 wiz Exp $");
#include
#include
@@ -52,5 +52,5 @@
if ((error = rump_vfs_makeonedevnode(S_IFCHR,
"/dev/zfs", cmaj, 0)) != 0)
- panic("cannot create cooked cgd dev nodes: %d", error);
+ panic("cannot create zfs dev nodes: %d", error);
}
CVS commit: src/sys/rump/fs/lib/libzfs
Module Name:src
Committed By: pooka
Date: Thu Mar 10 19:24:38 UTC 2011
Modified Files:
src/sys/rump/fs/lib/libzfs: Makefile
Added Files:
src/sys/rump/fs/lib/libzfs: component.c
Log Message:
autocreate /dev/zfs. requested by riz
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/rump/fs/lib/libzfs/Makefile
cvs rdiff -u -r0 -r1.4 src/sys/rump/fs/lib/libzfs/component.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/rump/fs/lib/libzfs/Makefile
diff -u src/sys/rump/fs/lib/libzfs/Makefile:1.2 src/sys/rump/fs/lib/libzfs/Makefile:1.3
--- src/sys/rump/fs/lib/libzfs/Makefile:1.2 Fri Jan 21 13:11:04 2011
+++ src/sys/rump/fs/lib/libzfs/Makefile Thu Mar 10 19:24:37 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2011/01/21 13:11:04 pooka Exp $
+# $NetBSD: Makefile,v 1.3 2011/03/10 19:24:37 pooka Exp $
#
S!= cd ${.PARSEDIR}/../../../../;pwd
@@ -11,6 +11,7 @@
CPPFLAGS+= -I${RUMPTOP}/librump/rumpkern -I${RUMPTOP}/librump/rumpvfs\
-I${RUMPTOP}/librump/rumpdev
+SRCS+= component.c
.include
.include
Added files:
Index: src/sys/rump/fs/lib/libzfs/component.c
diff -u /dev/null src/sys/rump/fs/lib/libzfs/component.c:1.4
--- /dev/null Thu Mar 10 19:24:38 2011
+++ src/sys/rump/fs/lib/libzfs/component.c Thu Mar 10 19:24:37 2011
@@ -0,0 +1,56 @@
+/* $NetBSD: component.c,v 1.4 2011/03/10 19:24:37 pooka Exp $ */
+
+/*
+ * Copyright (c) 2009 Antti Kantee. All Rights Reserved.
+ *
+ * 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
+__KERNEL_RCSID(0, "$NetBSD: component.c,v 1.4 2011/03/10 19:24:37 pooka Exp $");
+
+#include
+#include
+#include
+#include
+
+#include "rump_private.h"
+#include "rump_vfs_private.h"
+
+RUMP_COMPONENT(RUMP_COMPONENT_VFS)
+{
+ extern const struct bdevsw zfs_bdevsw;
+ extern const struct cdevsw zfs_cdevsw;
+ devmajor_t bmaj, cmaj;
+ int error;
+
+ /* go, mydevfs */
+ bmaj = cmaj = -1;
+
+ if ((error = devsw_attach("zfs", &zfs_bdevsw, &bmaj,
+ &zfs_cdevsw, &cmaj)) != 0 && error != EEXIST)
+ panic("cannot attach zfs: %d", error);
+
+ if ((error = rump_vfs_makeonedevnode(S_IFCHR,
+ "/dev/zfs", cmaj, 0)) != 0)
+ panic("cannot create cooked cgd dev nodes: %d", error);
+}
CVS commit: src/sys/rump/fs/lib/libzfs
Module Name:src Committed By: pooka Date: Fri Jan 21 13:11:32 UTC 2011 Removed Files: src/sys/rump/fs/lib/libzfs: component.c Log Message: no longer used To generate a diff of this commit: cvs rdiff -u -r1.2 -r0 src/sys/rump/fs/lib/libzfs/component.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/rump/fs/lib/libzfs
Module Name:src
Committed By: pooka
Date: Fri Jan 21 12:23:29 UTC 2011
Modified Files:
src/sys/rump/fs/lib/libzfs: component.c
Log Message:
don't perform tasks already done by zfs_modcmd
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/rump/fs/lib/libzfs/component.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/rump/fs/lib/libzfs/component.c
diff -u src/sys/rump/fs/lib/libzfs/component.c:1.1 src/sys/rump/fs/lib/libzfs/component.c:1.2
--- src/sys/rump/fs/lib/libzfs/component.c:1.1 Tue Jan 18 22:21:23 2011
+++ src/sys/rump/fs/lib/libzfs/component.c Fri Jan 21 12:23:29 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: component.c,v 1.1 2011/01/18 22:21:23 haad Exp $ */
+/* $NetBSD: component.c,v 1.2 2011/01/21 12:23:29 pooka Exp $ */
/*
* Copyright (c) 2010 Antti Kantee. All Rights Reserved.
@@ -26,7 +26,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: component.c,v 1.1 2011/01/18 22:21:23 haad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: component.c,v 1.2 2011/01/21 12:23:29 pooka Exp $");
#include
#include
@@ -80,31 +80,10 @@
#include "rump_dev_private.h"
#include "rump_vfs_private.h"
-RUMP_COMPONENT(RUMP_COMPONENT_KERN_VFS)
+RUMP_COMPONENT(RUMP_COMPONENT_VFS)
{
- int error;
-
extern int physmem;
- extern uint_t zfs_fsyncer_key;
- extern uint_t rrw_tsd_key;
-
- extern const struct bdevsw zfs_bdevsw;
- extern const struct cdevsw zfs_cdevsw;
-
- static int zfs_bmajor = -1;
- static int zfs_cmajor = -1;
-
/* Set physmem to fit zfs limits. ZFS_MINMEGS * 2048 / PAGE_SIZE */
physmem = 262144;
- error = devsw_attach("zfs", &zfs_bdevsw, &zfs_bmajor,
- &zfs_cdevsw, &zfs_cmajor);
- if (error != 0) {
- zvol_fini();
- zfs_vfsfini();
- spa_fini();
- lwp_specific_key_delete(zfs_fsyncer_key);
- lwp_specific_key_delete(rrw_tsd_key);
- }
- return;
}
CVS commit: src/sys/rump/fs
Module Name:src
Committed By: pooka
Date: Sun Dec 5 16:11:17 UTC 2010
Modified Files:
src/sys/rump/fs: Makefile.rumpfs
Added Files:
src/sys/rump/fs/lib/libnull: Makefile shlib_version
src/sys/rump/fs/lib/libumap: Makefile shlib_version
Removed Files:
src/sys/rump/fs/lib/libnullfs: Makefile shlib_version
src/sys/rump/fs/lib/libumapfs: Makefile shlib_version
Log Message:
Fix RUMPFSLIBS etc. As collateral, rename nullfs/umapfs to match
the vfsname, i.e. to "null" and "umap".
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/sys/rump/fs/Makefile.rumpfs
cvs rdiff -u -r0 -r1.1 src/sys/rump/fs/lib/libnull/Makefile \
src/sys/rump/fs/lib/libnull/shlib_version
cvs rdiff -u -r1.2 -r0 src/sys/rump/fs/lib/libnullfs/Makefile
cvs rdiff -u -r1.1 -r0 src/sys/rump/fs/lib/libnullfs/shlib_version
cvs rdiff -u -r0 -r1.1 src/sys/rump/fs/lib/libumap/Makefile \
src/sys/rump/fs/lib/libumap/shlib_version
cvs rdiff -u -r1.2 -r0 src/sys/rump/fs/lib/libumapfs/Makefile
cvs rdiff -u -r1.1 -r0 src/sys/rump/fs/lib/libumapfs/shlib_version
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/rump/fs/Makefile.rumpfs
diff -u src/sys/rump/fs/Makefile.rumpfs:1.25 src/sys/rump/fs/Makefile.rumpfs:1.26
--- src/sys/rump/fs/Makefile.rumpfs:1.25 Mon Jul 26 15:55:41 2010
+++ src/sys/rump/fs/Makefile.rumpfs Sun Dec 5 16:11:16 2010
@@ -1,15 +1,20 @@
-# $NetBSD: Makefile.rumpfs,v 1.25 2010/07/26 15:55:41 pooka Exp $
+# $NetBSD: Makefile.rumpfs,v 1.26 2010/12/05 16:11:16 pooka Exp $
#
-RUMPFSLIST= cd9660 efs ext2fs fdesc ffs hfs kernfs lfs mfs msdos \
- nfs nilfs ntfs nullfs ptyfs smbfs syspuffs sysvbfs \
- tmpfs udf umapfs union
+RUMPFSCOMP= cd9660 efs ext2fs fdesc ffs hfs kernfs lfs mfs msdos \
+ nfs nilfs ntfs null ptyfs smbfs syspuffs sysvbfs \
+ tmpfs udf umap union
-RUMPFSLIST+= fifovfs layervfs
+RUMPFSCOMP+= nfsserver
-RUMPFSLIST+= nfsserver
+RUMPVFSCOMP+= fifo layer
-.for var in ${RUMPFSLIST}
+.for var in ${RUMPFSCOMP}
RUMPFSLIBS+=lib${var}
RUMPFSLDADD+=-lrumpfs_${var}
.endfor
+
+.for var in ${RUMPVFSCOMP}
+RUMPFSLIBS+=lib${var}vfs
+RUMPFSLDADD+=-lrumpvfs_${var}fs
+.endfor
Added files:
Index: src/sys/rump/fs/lib/libnull/Makefile
diff -u /dev/null src/sys/rump/fs/lib/libnull/Makefile:1.1
--- /dev/null Sun Dec 5 16:11:17 2010
+++ src/sys/rump/fs/lib/libnull/Makefile Sun Dec 5 16:11:16 2010
@@ -0,0 +1,11 @@
+# $NetBSD: Makefile,v 1.1 2010/12/05 16:11:16 pooka Exp $
+#
+
+.PATH: ${.CURDIR}/../../../../miscfs/nullfs
+
+LIB= rumpfs_null
+
+SRCS= null_vfsops.c null_vnops.c
+
+.include
+.include
Index: src/sys/rump/fs/lib/libnull/shlib_version
diff -u /dev/null src/sys/rump/fs/lib/libnull/shlib_version:1.1
--- /dev/null Sun Dec 5 16:11:17 2010
+++ src/sys/rump/fs/lib/libnull/shlib_version Sun Dec 5 16:11:16 2010
@@ -0,0 +1,4 @@
+# $NetBSD: shlib_version,v 1.1 2010/12/05 16:11:16 pooka Exp $
+#
+major=0
+minor=0
Index: src/sys/rump/fs/lib/libumap/Makefile
diff -u /dev/null src/sys/rump/fs/lib/libumap/Makefile:1.1
--- /dev/null Sun Dec 5 16:11:17 2010
+++ src/sys/rump/fs/lib/libumap/Makefile Sun Dec 5 16:11:17 2010
@@ -0,0 +1,11 @@
+# $NetBSD: Makefile,v 1.1 2010/12/05 16:11:17 pooka Exp $
+#
+
+.PATH: ${.CURDIR}/../../../../miscfs/umapfs
+
+LIB= rumpfs_umap
+
+SRCS= umap_subr.c umap_vfsops.c umap_vnops.c
+
+.include
+.include
Index: src/sys/rump/fs/lib/libumap/shlib_version
diff -u /dev/null src/sys/rump/fs/lib/libumap/shlib_version:1.1
--- /dev/null Sun Dec 5 16:11:17 2010
+++ src/sys/rump/fs/lib/libumap/shlib_version Sun Dec 5 16:11:17 2010
@@ -0,0 +1,4 @@
+# $NetBSD: shlib_version,v 1.1 2010/12/05 16:11:17 pooka Exp $
+#
+major=0
+minor=0
CVS commit: src/sys/rump/fs/rumptest
Module Name:src Committed By: pooka Date: Sun Dec 5 16:02:04 UTC 2010 Removed Files: src/sys/rump/fs/rumptest: Makefile rumptest.c Log Message: get rid of this uninstalled "test", even i haven't compiled it for ages To generate a diff of this commit: cvs rdiff -u -r1.6 -r0 src/sys/rump/fs/rumptest/Makefile cvs rdiff -u -r1.3 -r0 src/sys/rump/fs/rumptest/rumptest.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/rump/fs
Module Name:src
Committed By: pooka
Date: Mon Jul 26 15:55:41 UTC 2010
Modified Files:
src/sys/rump/fs: Makefile.rumpfs
Log Message:
Descend into nfsserver, i.e. build & install the kernel nfs server bits.
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/sys/rump/fs/Makefile.rumpfs
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/rump/fs/Makefile.rumpfs
diff -u src/sys/rump/fs/Makefile.rumpfs:1.24 src/sys/rump/fs/Makefile.rumpfs:1.25
--- src/sys/rump/fs/Makefile.rumpfs:1.24 Mon Jun 14 14:36:15 2010
+++ src/sys/rump/fs/Makefile.rumpfs Mon Jul 26 15:55:41 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.rumpfs,v 1.24 2010/06/14 14:36:15 pooka Exp $
+# $NetBSD: Makefile.rumpfs,v 1.25 2010/07/26 15:55:41 pooka Exp $
#
RUMPFSLIST= cd9660 efs ext2fs fdesc ffs hfs kernfs lfs mfs msdos \
@@ -7,6 +7,8 @@
RUMPFSLIST+= fifovfs layervfs
+RUMPFSLIST+= nfsserver
+
.for var in ${RUMPFSLIST}
RUMPFSLIBS+=lib${var}
RUMPFSLDADD+=-lrumpfs_${var}
CVS commit: src/sys/rump/fs/lib/libsyspuffs
Module Name:src
Committed By: pooka
Date: Wed Jun 30 15:50:20 UTC 2010
Modified Files:
src/sys/rump/fs/lib/libsyspuffs: Makefile
Added Files:
src/sys/rump/fs/lib/libsyspuffs: component.c
Log Message:
add component constructor to create /dev/puffs -> putter symlink
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/rump/fs/lib/libsyspuffs/Makefile
cvs rdiff -u -r0 -r1.1 src/sys/rump/fs/lib/libsyspuffs/component.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/rump/fs/lib/libsyspuffs/Makefile
diff -u src/sys/rump/fs/lib/libsyspuffs/Makefile:1.4 src/sys/rump/fs/lib/libsyspuffs/Makefile:1.5
--- src/sys/rump/fs/lib/libsyspuffs/Makefile:1.4 Wed Oct 14 17:29:19 2009
+++ src/sys/rump/fs/lib/libsyspuffs/Makefile Wed Jun 30 15:50:20 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2009/10/14 17:29:19 pooka Exp $
+# $NetBSD: Makefile,v 1.5 2010/06/30 15:50:20 pooka Exp $
#
.PATH: ${.CURDIR}/../../../../fs/puffs
@@ -10,8 +10,10 @@
SRCS+= putter.c
SRCS+= puffs_rumpglue.c
+SRCS+= component.c
CPPFLAGS+= -DPUFFSDEBUG -DPUTTERDEBUG -I${RUMPTOP}/librump/rumpvfs
+CPPFLAGS+= -I${RUMPTOP}/librump/rumpkern
.include
.include
Added files:
Index: src/sys/rump/fs/lib/libsyspuffs/component.c
diff -u /dev/null src/sys/rump/fs/lib/libsyspuffs/component.c:1.1
--- /dev/null Wed Jun 30 15:50:20 2010
+++ src/sys/rump/fs/lib/libsyspuffs/component.c Wed Jun 30 15:50:20 2010
@@ -0,0 +1,44 @@
+/* $NetBSD: component.c,v 1.1 2010/06/30 15:50:20 pooka Exp $ */
+
+/*
+ * Copyright (c) 2010 Antti Kantee. All Rights Reserved.
+ *
+ * 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
+__KERNEL_RCSID(0, "$NetBSD: component.c,v 1.1 2010/06/30 15:50:20 pooka Exp $");
+
+#include
+#include
+#include
+#include
+#include
+#include
+
+#include "rump_private.h"
+
+RUMP_COMPONENT(RUMP_COMPONENT_VFS)
+{
+
+ FLAWLESSCALL(do_sys_symlink("putter", "/dev/puffs", UIO_SYSSPACE));
+}
CVS commit: src/sys/rump/fs
Module Name:src
Committed By: pooka
Date: Mon Jun 14 14:36:15 UTC 2010
Modified Files:
src/sys/rump/fs: Makefile.rumpfs
Added Files:
src/sys/rump/fs/lib/libptyfs: Makefile shlib_version
Log Message:
ptyfs rump component
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/sys/rump/fs/Makefile.rumpfs
cvs rdiff -u -r0 -r1.1 src/sys/rump/fs/lib/libptyfs/Makefile \
src/sys/rump/fs/lib/libptyfs/shlib_version
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/rump/fs/Makefile.rumpfs
diff -u src/sys/rump/fs/Makefile.rumpfs:1.23 src/sys/rump/fs/Makefile.rumpfs:1.24
--- src/sys/rump/fs/Makefile.rumpfs:1.23 Wed Mar 31 14:18:33 2010
+++ src/sys/rump/fs/Makefile.rumpfs Mon Jun 14 14:36:15 2010
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.rumpfs,v 1.23 2010/03/31 14:18:33 pooka Exp $
+# $NetBSD: Makefile.rumpfs,v 1.24 2010/06/14 14:36:15 pooka Exp $
#
RUMPFSLIST= cd9660 efs ext2fs fdesc ffs hfs kernfs lfs mfs msdos \
- nfs nilfs ntfs nullfs smbfs syspuffs sysvbfs tmpfs udf \
- umapfs union
+ nfs nilfs ntfs nullfs ptyfs smbfs syspuffs sysvbfs \
+ tmpfs udf umapfs union
RUMPFSLIST+= fifovfs layervfs
Added files:
Index: src/sys/rump/fs/lib/libptyfs/Makefile
diff -u /dev/null src/sys/rump/fs/lib/libptyfs/Makefile:1.1
--- /dev/null Mon Jun 14 14:36:15 2010
+++ src/sys/rump/fs/lib/libptyfs/Makefile Mon Jun 14 14:36:15 2010
@@ -0,0 +1,11 @@
+# $NetBSD: Makefile,v 1.1 2010/06/14 14:36:15 pooka Exp $
+#
+
+.PATH: ${.CURDIR}/../../../../fs/ptyfs
+
+LIB= rumpfs_ptyfs
+
+SRCS+= ptyfs_subr.c ptyfs_vfsops.c ptyfs_vnops.c
+
+.include
+.include
Index: src/sys/rump/fs/lib/libptyfs/shlib_version
diff -u /dev/null src/sys/rump/fs/lib/libptyfs/shlib_version:1.1
--- /dev/null Mon Jun 14 14:36:15 2010
+++ src/sys/rump/fs/lib/libptyfs/shlib_version Mon Jun 14 14:36:15 2010
@@ -0,0 +1,4 @@
+# $NetBSD: shlib_version,v 1.1 2010/06/14 14:36:15 pooka Exp $
+#
+major=0
+minor=0
CVS commit: src/sys/rump/fs/lib/libffs
Module Name:src
Committed By: pooka
Date: Thu May 20 18:23:59 UTC 2010
Modified Files:
src/sys/rump/fs/lib/libffs: Makefile
Log Message:
include extattr support
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/rump/fs/lib/libffs/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/rump/fs/lib/libffs/Makefile
diff -u src/sys/rump/fs/lib/libffs/Makefile:1.11 src/sys/rump/fs/lib/libffs/Makefile:1.12
--- src/sys/rump/fs/lib/libffs/Makefile:1.11 Tue Mar 2 11:29:04 2010
+++ src/sys/rump/fs/lib/libffs/Makefile Thu May 20 18:23:59 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2010/03/02 11:29:04 pooka Exp $
+# $NetBSD: Makefile,v 1.12 2010/05/20 18:23:59 pooka Exp $
#
.PATH: ${.CURDIR}/../../../../ufs/ffs ${.CURDIR}/../../../../ufs/ufs
@@ -9,10 +9,10 @@
ffs_snapshot.c ffs_subr.c ffs_tables.c ffs_vfsops.c ffs_vnops.c \
ffs_wapbl.c
-SRCS+= ufs_bmap.c ufs_dirhash.c ufs_ihash.c ufs_inode.c ufs_lookup.c \
- ufs_vfsops.c ufs_vnops.c ufs_wapbl.c
+SRCS+= ufs_bmap.c ufs_dirhash.c ufs_extattr.c ufs_ihash.c ufs_inode.c \
+ ufs_lookup.c ufs_vfsops.c ufs_vnops.c ufs_wapbl.c
-CPPFLAGS+= -DFFS_EI -DUFS_DIRHASH -DWAPBL -DAPPLE_UFS
+CPPFLAGS+= -DFFS_EI -DUFS_DIRHASH -DWAPBL -DAPPLE_UFS -DUFS_EXTATTR
.include
.include
CVS commit: src/sys/rump/fs
Module Name:src
Committed By: pooka
Date: Wed Mar 31 14:18:33 UTC 2010
Modified Files:
src/sys/rump/fs: Makefile.rumpfs
Added Files:
src/sys/rump/fs/lib/libkernfs: Makefile shlib_version
Log Message:
support kernfs
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/sys/rump/fs/Makefile.rumpfs
cvs rdiff -u -r0 -r1.1 src/sys/rump/fs/lib/libkernfs/Makefile \
src/sys/rump/fs/lib/libkernfs/shlib_version
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/rump/fs/Makefile.rumpfs
diff -u src/sys/rump/fs/Makefile.rumpfs:1.22 src/sys/rump/fs/Makefile.rumpfs:1.23
--- src/sys/rump/fs/Makefile.rumpfs:1.22 Wed Mar 31 14:12:33 2010
+++ src/sys/rump/fs/Makefile.rumpfs Wed Mar 31 14:18:33 2010
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.rumpfs,v 1.22 2010/03/31 14:12:33 pooka Exp $
+# $NetBSD: Makefile.rumpfs,v 1.23 2010/03/31 14:18:33 pooka Exp $
#
-RUMPFSLIST= cd9660 efs ext2fs fdesc ffs hfs lfs mfs msdos \
+RUMPFSLIST= cd9660 efs ext2fs fdesc ffs hfs kernfs lfs mfs msdos \
nfs nilfs ntfs nullfs smbfs syspuffs sysvbfs tmpfs udf \
umapfs union
Added files:
Index: src/sys/rump/fs/lib/libkernfs/Makefile
diff -u /dev/null src/sys/rump/fs/lib/libkernfs/Makefile:1.1
--- /dev/null Wed Mar 31 14:18:33 2010
+++ src/sys/rump/fs/lib/libkernfs/Makefile Wed Mar 31 14:18:33 2010
@@ -0,0 +1,11 @@
+# $NetBSD: Makefile,v 1.1 2010/03/31 14:18:33 pooka Exp $
+#
+
+.PATH: ${.CURDIR}/../../../../miscfs/kernfs
+
+LIB= rumpfs_kernfs
+
+SRCS= kernfs_subr.c kernfs_vfsops.c kernfs_vnops.c
+
+.include
+.include
Index: src/sys/rump/fs/lib/libkernfs/shlib_version
diff -u /dev/null src/sys/rump/fs/lib/libkernfs/shlib_version:1.1
--- /dev/null Wed Mar 31 14:18:33 2010
+++ src/sys/rump/fs/lib/libkernfs/shlib_version Wed Mar 31 14:18:33 2010
@@ -0,0 +1,4 @@
+# $NetBSD: shlib_version,v 1.1 2010/03/31 14:18:33 pooka Exp $
+#
+major=0
+minor=0
CVS commit: src/sys/rump/fs
Module Name:src
Committed By: pooka
Date: Wed Mar 31 14:12:33 UTC 2010
Modified Files:
src/sys/rump/fs: Makefile.rumpfs
Log Message:
separate vfs-like components from actual drivers
(no functional change)
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/sys/rump/fs/Makefile.rumpfs
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/rump/fs/Makefile.rumpfs
diff -u src/sys/rump/fs/Makefile.rumpfs:1.21 src/sys/rump/fs/Makefile.rumpfs:1.22
--- src/sys/rump/fs/Makefile.rumpfs:1.21 Tue Mar 30 00:59:07 2010
+++ src/sys/rump/fs/Makefile.rumpfs Wed Mar 31 14:12:33 2010
@@ -1,9 +1,11 @@
-# $NetBSD: Makefile.rumpfs,v 1.21 2010/03/30 00:59:07 pooka Exp $
+# $NetBSD: Makefile.rumpfs,v 1.22 2010/03/31 14:12:33 pooka Exp $
#
-RUMPFSLIST= cd9660 efs ext2fs fdesc ffs fifovfs hfs layervfs lfs \
- mfs msdos nfs nilfs ntfs nullfs smbfs syspuffs sysvbfs \
- tmpfs udf umapfs union
+RUMPFSLIST= cd9660 efs ext2fs fdesc ffs hfs lfs mfs msdos \
+ nfs nilfs ntfs nullfs smbfs syspuffs sysvbfs tmpfs udf \
+ umapfs union
+
+RUMPFSLIST+= fifovfs layervfs
.for var in ${RUMPFSLIST}
RUMPFSLIBS+=lib${var}
CVS commit: src/sys/rump/fs
Module Name:src
Committed By: pooka
Date: Tue Mar 30 00:59:07 UTC 2010
Modified Files:
src/sys/rump/fs: Makefile.rumpfs
Added Files:
src/sys/rump/fs/lib/libnullfs: Makefile shlib_version
src/sys/rump/fs/lib/libumapfs: Makefile shlib_version
Log Message:
support nullfs and umapfs
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/sys/rump/fs/Makefile.rumpfs
cvs rdiff -u -r0 -r1.1 src/sys/rump/fs/lib/libnullfs/Makefile \
src/sys/rump/fs/lib/libnullfs/shlib_version
cvs rdiff -u -r0 -r1.1 src/sys/rump/fs/lib/libumapfs/Makefile \
src/sys/rump/fs/lib/libumapfs/shlib_version
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/rump/fs/Makefile.rumpfs
diff -u src/sys/rump/fs/Makefile.rumpfs:1.20 src/sys/rump/fs/Makefile.rumpfs:1.21
--- src/sys/rump/fs/Makefile.rumpfs:1.20 Mon Mar 29 18:12:23 2010
+++ src/sys/rump/fs/Makefile.rumpfs Tue Mar 30 00:59:07 2010
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile.rumpfs,v 1.20 2010/03/29 18:12:23 pooka Exp $
+# $NetBSD: Makefile.rumpfs,v 1.21 2010/03/30 00:59:07 pooka Exp $
#
-RUMPFSLIST= cd9660 efs ext2fs fdesc ffs fifovfs hfs layervfs lfs mfs msdos
-RUMPFSLIST+= nfs nilfs ntfs smbfs syspuffs sysvbfs tmpfs udf union
+RUMPFSLIST= cd9660 efs ext2fs fdesc ffs fifovfs hfs layervfs lfs \
+ mfs msdos nfs nilfs ntfs nullfs smbfs syspuffs sysvbfs \
+ tmpfs udf umapfs union
.for var in ${RUMPFSLIST}
RUMPFSLIBS+=lib${var}
Added files:
Index: src/sys/rump/fs/lib/libnullfs/Makefile
diff -u /dev/null src/sys/rump/fs/lib/libnullfs/Makefile:1.1
--- /dev/null Tue Mar 30 00:59:07 2010
+++ src/sys/rump/fs/lib/libnullfs/Makefile Tue Mar 30 00:59:07 2010
@@ -0,0 +1,11 @@
+# $NetBSD: Makefile,v 1.1 2010/03/30 00:59:07 pooka Exp $
+#
+
+.PATH: ${.CURDIR}/../../../../miscfs/nullfs
+
+LIB= rumpfs_nullfs
+
+SRCS= null_vfsops.c null_vnops.c
+
+.include
+.include
Index: src/sys/rump/fs/lib/libnullfs/shlib_version
diff -u /dev/null src/sys/rump/fs/lib/libnullfs/shlib_version:1.1
--- /dev/null Tue Mar 30 00:59:07 2010
+++ src/sys/rump/fs/lib/libnullfs/shlib_version Tue Mar 30 00:59:07 2010
@@ -0,0 +1,4 @@
+# $NetBSD: shlib_version,v 1.1 2010/03/30 00:59:07 pooka Exp $
+#
+major=0
+minor=0
Index: src/sys/rump/fs/lib/libumapfs/Makefile
diff -u /dev/null src/sys/rump/fs/lib/libumapfs/Makefile:1.1
--- /dev/null Tue Mar 30 00:59:07 2010
+++ src/sys/rump/fs/lib/libumapfs/Makefile Tue Mar 30 00:59:07 2010
@@ -0,0 +1,11 @@
+# $NetBSD: Makefile,v 1.1 2010/03/30 00:59:07 pooka Exp $
+#
+
+.PATH: ${.CURDIR}/../../../../miscfs/umapfs
+
+LIB= rumpfs_umapfs
+
+SRCS= umap_subr.c umap_vfsops.c umap_vnops.c
+
+.include
+.include
Index: src/sys/rump/fs/lib/libumapfs/shlib_version
diff -u /dev/null src/sys/rump/fs/lib/libumapfs/shlib_version:1.1
--- /dev/null Tue Mar 30 00:59:07 2010
+++ src/sys/rump/fs/lib/libumapfs/shlib_version Tue Mar 30 00:59:07 2010
@@ -0,0 +1,4 @@
+# $NetBSD: shlib_version,v 1.1 2010/03/30 00:59:07 pooka Exp $
+#
+major=0
+minor=0
CVS commit: src/sys/rump/fs
Module Name:src
Committed By: pooka
Date: Mon Mar 29 18:12:24 UTC 2010
Modified Files:
src/sys/rump/fs: Makefile.rumpfs
Added Files:
src/sys/rump/fs/lib/liblayervfs: Makefile shlib_version
src/sys/rump/fs/lib/libunion: Makefile shlib_version
Log Message:
Support unionfs (and layervfs, which is required for unionfs).
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/sys/rump/fs/Makefile.rumpfs
cvs rdiff -u -r0 -r1.1 src/sys/rump/fs/lib/liblayervfs/Makefile \
src/sys/rump/fs/lib/liblayervfs/shlib_version
cvs rdiff -u -r0 -r1.1 src/sys/rump/fs/lib/libunion/Makefile \
src/sys/rump/fs/lib/libunion/shlib_version
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/rump/fs/Makefile.rumpfs
diff -u src/sys/rump/fs/Makefile.rumpfs:1.19 src/sys/rump/fs/Makefile.rumpfs:1.20
--- src/sys/rump/fs/Makefile.rumpfs:1.19 Mon Mar 29 13:20:31 2010
+++ src/sys/rump/fs/Makefile.rumpfs Mon Mar 29 18:12:23 2010
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.rumpfs,v 1.19 2010/03/29 13:20:31 pooka Exp $
+# $NetBSD: Makefile.rumpfs,v 1.20 2010/03/29 18:12:23 pooka Exp $
#
-RUMPFSLIST= cd9660 efs ext2fs fdesc ffs fifovfs hfs lfs mfs msdos
-RUMPFSLIST+= nfs nilfs ntfs smbfs syspuffs sysvbfs tmpfs udf
+RUMPFSLIST= cd9660 efs ext2fs fdesc ffs fifovfs hfs layervfs lfs mfs msdos
+RUMPFSLIST+= nfs nilfs ntfs smbfs syspuffs sysvbfs tmpfs udf union
.for var in ${RUMPFSLIST}
RUMPFSLIBS+=lib${var}
Added files:
Index: src/sys/rump/fs/lib/liblayervfs/Makefile
diff -u /dev/null src/sys/rump/fs/lib/liblayervfs/Makefile:1.1
--- /dev/null Mon Mar 29 18:12:24 2010
+++ src/sys/rump/fs/lib/liblayervfs/Makefile Mon Mar 29 18:12:23 2010
@@ -0,0 +1,11 @@
+# $NetBSD: Makefile,v 1.1 2010/03/29 18:12:23 pooka Exp $
+#
+
+.PATH: ${.CURDIR}/../../../../miscfs/genfs
+
+LIB= rumpvfs_layerfs
+
+SRCS= layer_subr.c layer_vfsops.c layer_vnops.c
+
+.include
+.include
Index: src/sys/rump/fs/lib/liblayervfs/shlib_version
diff -u /dev/null src/sys/rump/fs/lib/liblayervfs/shlib_version:1.1
--- /dev/null Mon Mar 29 18:12:24 2010
+++ src/sys/rump/fs/lib/liblayervfs/shlib_version Mon Mar 29 18:12:23 2010
@@ -0,0 +1,4 @@
+# $NetBSD: shlib_version,v 1.1 2010/03/29 18:12:23 pooka Exp $
+#
+major=0
+minor=0
Index: src/sys/rump/fs/lib/libunion/Makefile
diff -u /dev/null src/sys/rump/fs/lib/libunion/Makefile:1.1
--- /dev/null Mon Mar 29 18:12:24 2010
+++ src/sys/rump/fs/lib/libunion/Makefile Mon Mar 29 18:12:23 2010
@@ -0,0 +1,11 @@
+# $NetBSD: Makefile,v 1.1 2010/03/29 18:12:23 pooka Exp $
+#
+
+.PATH: ${.CURDIR}/../../../../fs/union
+
+LIB= rumpfs_union
+
+SRCS= union_subr.c union_vfsops.c union_vnops.c
+
+.include
+.include
Index: src/sys/rump/fs/lib/libunion/shlib_version
diff -u /dev/null src/sys/rump/fs/lib/libunion/shlib_version:1.1
--- /dev/null Mon Mar 29 18:12:24 2010
+++ src/sys/rump/fs/lib/libunion/shlib_version Mon Mar 29 18:12:24 2010
@@ -0,0 +1,4 @@
+# $NetBSD: shlib_version,v 1.1 2010/03/29 18:12:24 pooka Exp $
+#
+major=0
+minor=0
CVS commit: src/sys/rump/fs/lib/libntfs
Module Name:src
Committed By: pooka
Date: Tue Feb 16 20:34:04 UTC 2010
Modified Files:
src/sys/rump/fs/lib/libntfs: Makefile
Log Message:
remove -D__NetBSD__ (it's done globally now)
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/rump/fs/lib/libntfs/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/rump/fs/lib/libntfs/Makefile
diff -u src/sys/rump/fs/lib/libntfs/Makefile:1.4 src/sys/rump/fs/lib/libntfs/Makefile:1.5
--- src/sys/rump/fs/lib/libntfs/Makefile:1.4 Tue Jul 29 13:17:43 2008
+++ src/sys/rump/fs/lib/libntfs/Makefile Tue Feb 16 20:34:03 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2008/07/29 13:17:43 pooka Exp $
+# $NetBSD: Makefile,v 1.5 2010/02/16 20:34:03 pooka Exp $
#
.PATH: ${.CURDIR}/../../../../fs/ntfs
@@ -8,7 +8,7 @@
SRCS= ntfs_compr.c ntfs_conv.c ntfs_ihash.c ntfs_subr.c \
ntfs_vfsops.c ntfs_vnops.c
-CFLAGS+=-Wno-pointer-sign -D__NetBSD__
+CFLAGS+=-Wno-pointer-sign
.include
.include
CVS commit: src/sys/rump/fs/rumptest
Module Name:src
Committed By: pooka
Date: Fri Nov 20 15:37:44 UTC 2009
Modified Files:
src/sys/rump/fs/rumptest: Makefile
Log Message:
include components required by smbfs
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/rump/fs/rumptest/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/rump/fs/rumptest/Makefile
diff -u src/sys/rump/fs/rumptest/Makefile:1.5 src/sys/rump/fs/rumptest/Makefile:1.6
--- src/sys/rump/fs/rumptest/Makefile:1.5 Wed Jan 14 19:29:32 2009
+++ src/sys/rump/fs/rumptest/Makefile Fri Nov 20 15:37:44 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2009/01/14 19:29:32 pooka Exp $
+# $NetBSD: Makefile,v 1.6 2009/11/20 15:37:44 pooka Exp $
#
PROG= rumptest
@@ -10,6 +10,9 @@
# for NFS
LDADD+= -lrumpnet_sockin -lrumpnet
+# for SMBFS
+LDADD+= -lrumpcrypto -lrumpdev_netsmb -lrumpdev
+
LDADD+= -lpthread
.include "${.CURDIR}/../Makefile.rumpfs"
CVS commit: src/sys/rump/fs/lib/libsmbfs
Module Name:src
Committed By: pooka
Date: Fri Sep 4 12:16:54 UTC 2009
Added Files:
src/sys/rump/fs/lib/libsmbfs: Makefile shlib_version
Log Message:
rump smbfs component
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/sys/rump/fs/lib/libsmbfs/Makefile \
src/sys/rump/fs/lib/libsmbfs/shlib_version
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: src/sys/rump/fs/lib/libsmbfs/Makefile
diff -u /dev/null src/sys/rump/fs/lib/libsmbfs/Makefile:1.1
--- /dev/null Fri Sep 4 12:16:54 2009
+++ src/sys/rump/fs/lib/libsmbfs/Makefile Fri Sep 4 12:16:54 2009
@@ -0,0 +1,14 @@
+# $NetBSD: Makefile,v 1.1 2009/09/04 12:16:54 pooka Exp $
+#
+
+.PATH: ${.CURDIR}/../../../../fs/smbfs
+
+LIB= rumpfs_smbfs
+
+SRCS= smbfs_io.c smbfs_kq.c smbfs_node.c smbfs_smb.c smbfs_subr.c \
+ smbfs_vfsops.c smbfs_vnops.c
+
+CFLAGS+=-Wno-pointer-sign
+
+.include
+.include
Index: src/sys/rump/fs/lib/libsmbfs/shlib_version
diff -u /dev/null src/sys/rump/fs/lib/libsmbfs/shlib_version:1.1
--- /dev/null Fri Sep 4 12:16:54 2009
+++ src/sys/rump/fs/lib/libsmbfs/shlib_version Fri Sep 4 12:16:54 2009
@@ -0,0 +1,4 @@
+# $NetBSD: shlib_version,v 1.1 2009/09/04 12:16:54 pooka Exp $
+#
+major=0
+minor=0
CVS commit: src/sys/rump/fs/lib/libfdesc
Module Name:src
Committed By: pooka
Date: Fri Jul 31 19:16:45 UTC 2009
Added Files:
src/sys/rump/fs/lib/libfdesc: Makefile shlib_version
Log Message:
add fdesc fs rump lib
(don't descend in here by default, I don't want to deal with the
setlist pain for now)
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/sys/rump/fs/lib/libfdesc/Makefile \
src/sys/rump/fs/lib/libfdesc/shlib_version
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: src/sys/rump/fs/lib/libfdesc/Makefile
diff -u /dev/null src/sys/rump/fs/lib/libfdesc/Makefile:1.1
--- /dev/null Fri Jul 31 19:16:45 2009
+++ src/sys/rump/fs/lib/libfdesc/Makefile Fri Jul 31 19:16:45 2009
@@ -0,0 +1,11 @@
+# $NetBSD: Makefile,v 1.1 2009/07/31 19:16:45 pooka Exp $
+#
+
+.PATH: ${.CURDIR}/../../../../miscfs/fdesc
+
+LIB= rumpfs_fdesc
+
+SRCS= fdesc_vfsops.c fdesc_vnops.c
+
+.include
+.include
Index: src/sys/rump/fs/lib/libfdesc/shlib_version
diff -u /dev/null src/sys/rump/fs/lib/libfdesc/shlib_version:1.1
--- /dev/null Fri Jul 31 19:16:45 2009
+++ src/sys/rump/fs/lib/libfdesc/shlib_version Fri Jul 31 19:16:45 2009
@@ -0,0 +1,4 @@
+# $NetBSD: shlib_version,v 1.1 2009/07/31 19:16:45 pooka Exp $
+#
+major=0
+minor=0
CVS commit: src/sys/rump/fs/lib/libffs
Module Name:src
Committed By: pooka
Date: Mon Apr 6 20:46:44 UTC 2009
Modified Files:
src/sys/rump/fs/lib/libffs: Makefile
Log Message:
compile in snapshot code
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/rump/fs/lib/libffs/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/rump/fs/lib/libffs/Makefile
diff -u src/sys/rump/fs/lib/libffs/Makefile:1.7 src/sys/rump/fs/lib/libffs/Makefile:1.8
--- src/sys/rump/fs/lib/libffs/Makefile:1.7 Sun Feb 22 20:28:06 2009
+++ src/sys/rump/fs/lib/libffs/Makefile Mon Apr 6 20:46:44 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2009/02/22 20:28:06 ad Exp $
+# $NetBSD: Makefile,v 1.8 2009/04/06 20:46:44 pooka Exp $
#
.PATH: ${.CURDIR}/../../../../ufs/ffs
@@ -6,10 +6,10 @@
LIB= rumpfs_ffs
SRCS= ffs_alloc.c ffs_appleufs.c ffs_balloc.c ffs_bswap.c ffs_inode.c \
- ffs_subr.c ffs_tables.c ffs_vfsops.c \
- ffs_vnops.c ffs_snapshot.c ffs_wapbl.c
+ ffs_snapshot.c ffs_subr.c ffs_tables.c ffs_vfsops.c ffs_vnops.c \
+ ffs_wapbl.c
-CPPFLAGS+= -DFFS_NO_SNAPSHOT -DFFS_EI -DWAPBL -DAPPLE_UFS
+CPPFLAGS+= -DFFS_EI -DWAPBL -DAPPLE_UFS
CFLAGS+= -Wno-pointer-sign
.include
