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 <bsd.lib.mk>
.include <bsd.klinks.mk>
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 <sys/cdefs.h>
+__KERNEL_RCSID(0, "$NetBSD: zfs_component.c,v 1.1 2014/03/13 01:46:10 pooka Exp $");
+
+#include <sys/param.h>
+#include <sys/conf.h>
+#include <sys/device.h>
+#include <sys/stat.h>
+
+#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);
+}
