Module Name: src Committed By: pooka Date: Mon Apr 12 22:31:48 UTC 2010
Modified Files: src/sys/rump/dev: Makefile.rumpdev Added Files: src/sys/rump/dev/lib/libfss: Makefile component.c shlib_version Log Message: support file system snapshot device To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/sys/rump/dev/Makefile.rumpdev cvs rdiff -u -r0 -r1.1 src/sys/rump/dev/lib/libfss/Makefile \ src/sys/rump/dev/lib/libfss/component.c \ src/sys/rump/dev/lib/libfss/shlib_version 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/Makefile.rumpdev diff -u src/sys/rump/dev/Makefile.rumpdev:1.10 src/sys/rump/dev/Makefile.rumpdev:1.11 --- src/sys/rump/dev/Makefile.rumpdev:1.10 Mon Mar 22 12:14:51 2010 +++ src/sys/rump/dev/Makefile.rumpdev Mon Apr 12 22:31:48 2010 @@ -1,8 +1,8 @@ -# $NetBSD: Makefile.rumpdev,v 1.10 2010/03/22 12:14:51 pooka Exp $ +# $NetBSD: Makefile.rumpdev,v 1.11 2010/04/12 22:31:48 pooka Exp $ # -RUMPDEVLIST= bpf cgd disk dm netsmb raidframe rnd sysmon ubt ucom \ - ugenhc ulpt umass usb wscons +RUMPDEVLIST= bpf cgd disk dm fss netsmb raidframe rnd sysmon \ + ubt ucom ugenhc ulpt umass usb wscons .for var in ${RUMPDEVLIST} Added files: Index: src/sys/rump/dev/lib/libfss/Makefile diff -u /dev/null src/sys/rump/dev/lib/libfss/Makefile:1.1 --- /dev/null Mon Apr 12 22:31:48 2010 +++ src/sys/rump/dev/lib/libfss/Makefile Mon Apr 12 22:31:48 2010 @@ -0,0 +1,15 @@ +# $NetBSD: Makefile,v 1.1 2010/04/12 22:31:48 pooka Exp $ +# + +.PATH: ${.CURDIR}/../../../../dev + +LIB= rumpdev_fss + +SRCS= fss.c + +SRCS+= component.c + +CPPFLAGS+= -I${RUMPTOP}/librump/rumpvfs + +.include <bsd.lib.mk> +.include <bsd.klinks.mk> Index: src/sys/rump/dev/lib/libfss/component.c diff -u /dev/null src/sys/rump/dev/lib/libfss/component.c:1.1 --- /dev/null Mon Apr 12 22:31:48 2010 +++ src/sys/rump/dev/lib/libfss/component.c Mon Apr 12 22:31:48 2010 @@ -0,0 +1,59 @@ +/* $NetBSD: component.c,v 1.1 2010/04/12 22:31:48 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.1 2010/04/12 22:31:48 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_DEV) +{ + extern const struct bdevsw fss_bdevsw; + extern const struct cdevsw fss_cdevsw; + devmajor_t bmaj, cmaj; + int error; + + bmaj = bdevsw_lookup_major(&fss_bdevsw); + cmaj = cdevsw_lookup_major(&fss_cdevsw); + + if ((error = devsw_attach("fss", &fss_bdevsw, &bmaj, + &fss_cdevsw, &cmaj)) != 0) + panic("cannot attach fss: %d", error); + + if ((error = rump_vfs_makedevnodes(S_IFBLK, "/dev/fss", '0', + bmaj, 0, 4)) != 0) + panic("cannot create cooked fss dev nodes: %d", error); + if ((error = rump_vfs_makedevnodes(S_IFCHR, "/dev/rfss", '0', + cmaj, 0, 4)) != 0) + panic("cannot create raw fss dev nodes: %d", error); +} Index: src/sys/rump/dev/lib/libfss/shlib_version diff -u /dev/null src/sys/rump/dev/lib/libfss/shlib_version:1.1 --- /dev/null Mon Apr 12 22:31:48 2010 +++ src/sys/rump/dev/lib/libfss/shlib_version Mon Apr 12 22:31:48 2010 @@ -0,0 +1,4 @@ +# $NetBSD: shlib_version,v 1.1 2010/04/12 22:31:48 pooka Exp $ +# +major=0 +minor=0