Module Name: src
Committed By: pooka
Date: Wed Apr 14 16:05:53 UTC 2010
Modified Files:
src/sys/rump/librump/rumpvfs: rump_vfs_private.h rumpblk.c rumpfs.c
Log Message:
Use reserved major for rumpblk instead of picking something which
may conflict.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/rump/librump/rumpvfs/rump_vfs_private.h
cvs rdiff -u -r1.37 -r1.38 src/sys/rump/librump/rumpvfs/rumpblk.c
cvs rdiff -u -r1.38 -r1.39 src/sys/rump/librump/rumpvfs/rumpfs.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/librump/rumpvfs/rump_vfs_private.h
diff -u src/sys/rump/librump/rumpvfs/rump_vfs_private.h:1.10 src/sys/rump/librump/rumpvfs/rump_vfs_private.h:1.11
--- src/sys/rump/librump/rumpvfs/rump_vfs_private.h:1.10 Thu Dec 17 00:29:46 2009
+++ src/sys/rump/librump/rumpvfs/rump_vfs_private.h Wed Apr 14 16:05:53 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: rump_vfs_private.h,v 1.10 2009/12/17 00:29:46 pooka Exp $ */
+/* $NetBSD: rump_vfs_private.h,v 1.11 2010/04/14 16:05:53 pooka Exp $ */
/*
* Copyright (c) 2008 Antti Kantee. All Rights Reserved.
@@ -37,7 +37,7 @@
int rump_devnull_init(void);
-#define RUMPBLK 254
+#define RUMPBLK_DEVMAJOR 197 /* from conf/majors, XXX: not via config yet */
#define RUMPBLK_SIZENOTSET ((uint64_t)-1)
int rumpblk_register(const char *, devminor_t *, uint64_t, uint64_t);
int rumpblk_init(void);
Index: src/sys/rump/librump/rumpvfs/rumpblk.c
diff -u src/sys/rump/librump/rumpvfs/rumpblk.c:1.37 src/sys/rump/librump/rumpvfs/rumpblk.c:1.38
--- src/sys/rump/librump/rumpvfs/rumpblk.c:1.37 Sun Jan 31 13:15:08 2010
+++ src/sys/rump/librump/rumpvfs/rumpblk.c Wed Apr 14 16:05:53 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: rumpblk.c,v 1.37 2010/01/31 13:15:08 pooka Exp $ */
+/* $NetBSD: rumpblk.c,v 1.38 2010/04/14 16:05:53 pooka Exp $ */
/*
* Copyright (c) 2009 Antti Kantee. All Rights Reserved.
@@ -52,7 +52,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rumpblk.c,v 1.37 2010/01/31 13:15:08 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rumpblk.c,v 1.38 2010/04/14 16:05:53 pooka Exp $");
#include <sys/param.h>
#include <sys/buf.h>
@@ -297,7 +297,7 @@
rumpblk_init(void)
{
char buf[64];
- int rumpblk = RUMPBLK;
+ devmajor_t rumpblkmaj = RUMPBLK_DEVMAJOR;
unsigned tmp;
int error, i;
@@ -374,11 +374,13 @@
"rumpblk", "memblk all windows busy");
if (blkfail) {
- return devsw_attach("rumpblk", &rumpblk_bdevsw_fail, &rumpblk,
- &rumpblk_cdevsw, &rumpblk);
+ return devsw_attach("rumpblk",
+ &rumpblk_bdevsw_fail, &rumpblkmaj,
+ &rumpblk_cdevsw, &rumpblkmaj);
} else {
- return devsw_attach("rumpblk", &rumpblk_bdevsw, &rumpblk,
- &rumpblk_cdevsw, &rumpblk);
+ return devsw_attach("rumpblk",
+ &rumpblk_bdevsw, &rumpblkmaj,
+ &rumpblk_cdevsw, &rumpblkmaj);
}
}
Index: src/sys/rump/librump/rumpvfs/rumpfs.c
diff -u src/sys/rump/librump/rumpvfs/rumpfs.c:1.38 src/sys/rump/librump/rumpvfs/rumpfs.c:1.39
--- src/sys/rump/librump/rumpvfs/rumpfs.c:1.38 Mon Apr 12 21:37:44 2010
+++ src/sys/rump/librump/rumpvfs/rumpfs.c Wed Apr 14 16:05:53 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: rumpfs.c,v 1.38 2010/04/12 21:37:44 pooka Exp $ */
+/* $NetBSD: rumpfs.c,v 1.39 2010/04/14 16:05:53 pooka Exp $ */
/*
* Copyright (c) 2009 Antti Kantee. All Rights Reserved.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rumpfs.c,v 1.38 2010/04/12 21:37:44 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rumpfs.c,v 1.39 2010/04/14 16:05:53 pooka Exp $");
#include <sys/param.h>
#include <sys/atomic.h>
@@ -234,7 +234,7 @@
if (error != 0) {
return error;
}
- rdev = makedev(RUMPBLK, dmin);
+ rdev = makedev(RUMPBLK_DEVMAJOR, dmin);
}
et = kmem_alloc(sizeof(*et), KM_SLEEP);
