Module Name: src
Committed By: pooka
Date: Thu Mar 13 01:49:59 UTC 2014
Modified Files:
src/sys/rump/dev/lib/libraidframe: Makefile
Added Files:
src/sys/rump/dev/lib/libraidframe: raidframe_component.c
Removed Files:
src/sys/rump/dev/lib/libraidframe: component.c
Log Message:
rename component.c -> raidframe_component.c
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/rump/dev/lib/libraidframe/Makefile
cvs rdiff -u -r1.5 -r0 src/sys/rump/dev/lib/libraidframe/component.c
cvs rdiff -u -r0 -r1.1 \
src/sys/rump/dev/lib/libraidframe/raidframe_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/libraidframe/Makefile
diff -u src/sys/rump/dev/lib/libraidframe/Makefile:1.3 src/sys/rump/dev/lib/libraidframe/Makefile:1.4
--- src/sys/rump/dev/lib/libraidframe/Makefile:1.3 Mon Nov 23 12:23:20 2009
+++ src/sys/rump/dev/lib/libraidframe/Makefile Thu Mar 13 01:49:59 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2009/11/23 12:23:20 pooka Exp $
+# $NetBSD: Makefile,v 1.4 2014/03/13 01:49:59 pooka Exp $
#
.PATH: ${.CURDIR}/../../../../dev/raidframe
@@ -21,7 +21,7 @@ SRCS= rf_acctrace.c rf_alloclist.c rf_
rf_shutdown.c rf_sstf.c rf_states.c rf_stripelocks.c \
rf_strutils.c rf_utils.c rf_compat50.c rf_paritymap.c
-SRCS+= component.c
+SRCS+= raidframe_component.c
CPPFLAGS+= -I${RUMPTOP}/librump/rumpvfs
Added files:
Index: src/sys/rump/dev/lib/libraidframe/raidframe_component.c
diff -u /dev/null src/sys/rump/dev/lib/libraidframe/raidframe_component.c:1.1
--- /dev/null Thu Mar 13 01:49:59 2014
+++ src/sys/rump/dev/lib/libraidframe/raidframe_component.c Thu Mar 13 01:49:59 2014
@@ -0,0 +1,66 @@
+/* $NetBSD: raidframe_component.c,v 1.1 2014/03/13 01:49:59 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: raidframe_component.c,v 1.1 2014/03/13 01:49:59 pooka Exp $");
+
+#include <sys/param.h>
+#include <sys/conf.h>
+#include <sys/device.h>
+#include <sys/stat.h>
+
+#include "rump_private.h"
+#include "rump_dev_private.h"
+#include "rump_vfs_private.h"
+
+CFDRIVER_DECL(raid, DV_DISK, NULL);
+
+void raidattach(int);
+
+RUMP_COMPONENT(RUMP_COMPONENT_DEV)
+{
+ extern const struct bdevsw raid_bdevsw;
+ extern const struct cdevsw raid_cdevsw;
+ devmajor_t bmaj, cmaj;
+ int error;
+
+ config_cfdriver_attach(&raid_cd);
+
+ bmaj = cmaj = -1;
+ if ((error = devsw_attach("raid", &raid_bdevsw, &bmaj,
+ &raid_cdevsw, &cmaj)) != 0)
+ panic("raid devsw attach failed: %d", error);
+
+ if ((error = rump_vfs_makedevnodes(S_IFBLK, "/dev/raid0", 'a',
+ bmaj, 0, 7)) != 0)
+ panic("cannot create cooked raid dev nodes: %d", error);
+ if ((error = rump_vfs_makedevnodes(S_IFCHR, "/dev/rraid0", 'a',
+ cmaj, 0, 7)) != 0)
+ panic("cannot create raw raid dev nodes: %d", error);
+
+ rump_pdev_add(raidattach, 4);
+}
