Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/rump/dev/lib/libdm rename component.c -> dm_component.c



details:   https://anonhg.NetBSD.org/src/rev/0764f0cdac77
branches:  trunk
changeset: 327633:0764f0cdac77
user:      pooka <pooka%NetBSD.org@localhost>
date:      Thu Mar 13 01:54:22 2014 +0000

description:
rename component.c -> dm_component.c

diffstat:

 sys/rump/dev/lib/libdm/Makefile       |   4 +-
 sys/rump/dev/lib/libdm/component.c    |  64 -----------------------------------
 sys/rump/dev/lib/libdm/dm_component.c |  64 +++++++++++++++++++++++++++++++++++
 3 files changed, 66 insertions(+), 66 deletions(-)

diffs (154 lines):

diff -r 119acf6c369b -r 0764f0cdac77 sys/rump/dev/lib/libdm/Makefile
--- a/sys/rump/dev/lib/libdm/Makefile   Thu Mar 13 01:53:48 2014 +0000
+++ b/sys/rump/dev/lib/libdm/Makefile   Thu Mar 13 01:54:22 2014 +0000
@@ -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 @@
 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
 
diff -r 119acf6c369b -r 0764f0cdac77 sys/rump/dev/lib/libdm/component.c
--- a/sys/rump/dev/lib/libdm/component.c        Thu Mar 13 01:53:48 2014 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,64 +0,0 @@
-/*     $NetBSD: component.c,v 1.3 2010/10/12 09:14:43 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: component.c,v 1.3 2010/10/12 09:14:43 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);
-                
-       }
-}
diff -r 119acf6c369b -r 0764f0cdac77 sys/rump/dev/lib/libdm/dm_component.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/rump/dev/lib/libdm/dm_component.c     Thu Mar 13 01:54:22 2014 +0000
@@ -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);
+                
+       }
+}



Home | Main Index | Thread Index | Old Index