| g_mirror.c (190676) | g_mirror.c (190878) |
|---|---|
| 1/*- 2 * Copyright (c) 2004-2006 Pawel Jakub Dawidek <pjd@FreeBSD.org> 3 * All rights reserved. 4 * 5 * Redistribution and use in source and binary forms, with or without 6 * modification, are permitted provided that the following conditions 7 * are met: 8 * 1. Redistributions of source code must retain the above copyright --- 11 unchanged lines hidden (view full) --- 20 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 21 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 22 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 23 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 24 * SUCH DAMAGE. 25 */ 26 27#include <sys/cdefs.h> | 1/*- 2 * Copyright (c) 2004-2006 Pawel Jakub Dawidek <pjd@FreeBSD.org> 3 * All rights reserved. 4 * 5 * Redistribution and use in source and binary forms, with or without 6 * modification, are permitted provided that the following conditions 7 * are met: 8 * 1. Redistributions of source code must retain the above copyright --- 11 unchanged lines hidden (view full) --- 20 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 21 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 22 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 23 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 24 * SUCH DAMAGE. 25 */ 26 27#include <sys/cdefs.h> |
| 28__FBSDID("$FreeBSD: head/sys/geom/mirror/g_mirror.c 190676 2009-04-03 19:46:12Z thompsa $"); | 28__FBSDID("$FreeBSD: head/sys/geom/mirror/g_mirror.c 190878 2009-04-10 04:08:34Z thompsa $"); |
| 29 30#include <sys/param.h> 31#include <sys/systm.h> 32#include <sys/kernel.h> 33#include <sys/module.h> 34#include <sys/limits.h> 35#include <sys/lock.h> 36#include <sys/mutex.h> --- 2865 unchanged lines hidden (view full) --- 2902 g_destroy_geom(sc->sc_geom); 2903 free(sc, M_MIRROR); 2904 return (NULL); 2905 } 2906 2907 G_MIRROR_DEBUG(1, "Device %s created (%u components, id=%u).", 2908 sc->sc_name, sc->sc_ndisks, sc->sc_id); 2909 | 29 30#include <sys/param.h> 31#include <sys/systm.h> 32#include <sys/kernel.h> 33#include <sys/module.h> 34#include <sys/limits.h> 35#include <sys/lock.h> 36#include <sys/mutex.h> --- 2865 unchanged lines hidden (view full) --- 2902 g_destroy_geom(sc->sc_geom); 2903 free(sc, M_MIRROR); 2904 return (NULL); 2905 } 2906 2907 G_MIRROR_DEBUG(1, "Device %s created (%u components, id=%u).", 2908 sc->sc_name, sc->sc_ndisks, sc->sc_id); 2909 |
| 2910 sc->sc_rootmount = root_mount_hold("GMIRROR", M_WAITOK); | 2910 sc->sc_rootmount = root_mount_hold("GMIRROR"); |
| 2911 G_MIRROR_DEBUG(1, "root_mount_hold %p", sc->sc_rootmount); 2912 /* 2913 * Run timeout. 2914 */ 2915 timeout = g_mirror_timeout * hz; 2916 callout_reset(&sc->sc_callout, timeout, g_mirror_go, sc); 2917 return (sc->sc_geom); 2918} --- 344 unchanged lines hidden --- | 2911 G_MIRROR_DEBUG(1, "root_mount_hold %p", sc->sc_rootmount); 2912 /* 2913 * Run timeout. 2914 */ 2915 timeout = g_mirror_timeout * hz; 2916 callout_reset(&sc->sc_callout, timeout, g_mirror_go, sc); 2917 return (sc->sc_geom); 2918} --- 344 unchanged lines hidden --- |