Module Name:    src
Committed By:   pooka
Date:           Thu Mar 13 01:54:22 UTC 2014

Modified Files:
        src/sys/rump/dev/lib/libdm: Makefile
Added Files:
        src/sys/rump/dev/lib/libdm: dm_component.c
Removed Files:
        src/sys/rump/dev/lib/libdm: component.c

Log Message:
rename component.c -> dm_component.c


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/rump/dev/lib/libdm/Makefile
cvs rdiff -u -r1.3 -r0 src/sys/rump/dev/lib/libdm/component.c
cvs rdiff -u -r0 -r1.1 src/sys/rump/dev/lib/libdm/dm_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/dev/lib/libdm/Makefile
diff -u src/sys/rump/dev/lib/libdm/Makefile:1.3 src/sys/rump/dev/lib/libdm/Makefile:1.4
--- src/sys/rump/dev/lib/libdm/Makefile:1.3	Mon Jun  7 13:57:20 2010
+++ src/sys/rump/dev/lib/libdm/Makefile	Thu Mar 13 01:54:22 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.3 2010/06/07 13:57:20 pooka Exp $
+#	$NetBSD: Makefile,v 1.4 2014/03/13 01:54:22 pooka Exp $
 #
 
 .PATH:	${.CURDIR}/../../../../dev/dm
@@ -8,7 +8,7 @@ LIB=	rumpdev_dm
 SRCS=   device-mapper.c dm_dev.c dm_ioctl.c dm_pdev.c dm_table.c dm_target.c \
         dm_target_linear.c dm_target_stripe.c
 
-SRCS+=	component.c
+SRCS+=	dm_component.c
 
 CPPFLAGS+=	-I${RUMPTOP}/librump/rumpvfs
 

Added files:

Index: src/sys/rump/dev/lib/libdm/dm_component.c
diff -u /dev/null src/sys/rump/dev/lib/libdm/dm_component.c:1.1
--- /dev/null	Thu Mar 13 01:54:22 2014
+++ src/sys/rump/dev/lib/libdm/dm_component.c	Thu Mar 13 01:54:22 2014
@@ -0,0 +1,64 @@
+/*	$NetBSD: dm_component.c,v 1.1 2014/03/13 01:54:22 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: dm_component.c,v 1.1 2014/03/13 01:54:22 pooka Exp $");
+
+#include <sys/param.h>
+#include <sys/conf.h>
+#include <sys/device.h>
+#include <sys/stat.h>
+#include <sys/filedesc.h>
+
+#include <sys/vfs_syscalls.h>
+
+#include "rump_private.h"
+#include "rump_dev_private.h"
+#include "rump_vfs_private.h"
+
+RUMP_COMPONENT(RUMP_COMPONENT_DEV)
+{
+	extern const struct bdevsw dm_bdevsw;
+	extern const struct cdevsw dm_cdevsw;
+	devmajor_t bmaj, cmaj;
+	int error;
+	
+	/* go, mydevfs */
+	bmaj = cmaj = -1;
+
+	if ((error = devsw_attach("dm", &dm_bdevsw, &bmaj,
+	    &dm_cdevsw, &cmaj)) != 0)
+		panic("cannot attach dm: %d", error);
+
+	do_sys_mkdir("/dev/mapper", 0770, UIO_SYSSPACE);
+	
+	if ((error = rump_vfs_makedevnodes(S_IFCHR, "/dev/mapper/control", 0,
+		    cmaj, 0, 1)) != 0) { 
+		panic("cannot create device-mapper control device: %d", error);
+		 
+	}
+}

Reply via email to