| g_journal.c (190676) | g_journal.c (190878) |
|---|---|
| 1/*- 2 * Copyright (c) 2005-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) 2005-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/journal/g_journal.c 190676 2009-04-03 19:46:12Z thompsa $"); | 28__FBSDID("$FreeBSD: head/sys/geom/journal/g_journal.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> --- 2268 unchanged lines hidden (view full) --- 2305 sc->sc_flush_queue = NULL; 2306 sc->sc_flush_count = 0; 2307 sc->sc_flush_in_progress = 0; 2308 sc->sc_copy_queue = NULL; 2309 sc->sc_copy_in_progress = 0; 2310 sc->sc_inactive.jj_queue = NULL; 2311 sc->sc_active.jj_queue = NULL; 2312 | 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> --- 2268 unchanged lines hidden (view full) --- 2305 sc->sc_flush_queue = NULL; 2306 sc->sc_flush_count = 0; 2307 sc->sc_flush_in_progress = 0; 2308 sc->sc_copy_queue = NULL; 2309 sc->sc_copy_in_progress = 0; 2310 sc->sc_inactive.jj_queue = NULL; 2311 sc->sc_active.jj_queue = NULL; 2312 |
| 2313 sc->sc_rootmount = root_mount_hold("GJOURNAL", M_WAITOK); | 2313 sc->sc_rootmount = root_mount_hold("GJOURNAL"); |
| 2314 GJ_DEBUG(1, "root_mount_hold %p", sc->sc_rootmount); 2315 2316 callout_init(&sc->sc_callout, CALLOUT_MPSAFE); 2317 if (md->md_type != GJ_TYPE_COMPLETE) { 2318 /* 2319 * Journal and data are on separate providers. 2320 * At this point we have only one of them. 2321 * We setup a timeout in case the other part will not --- 737 unchanged lines hidden --- | 2314 GJ_DEBUG(1, "root_mount_hold %p", sc->sc_rootmount); 2315 2316 callout_init(&sc->sc_callout, CALLOUT_MPSAFE); 2317 if (md->md_type != GJ_TYPE_COMPLETE) { 2318 /* 2319 * Journal and data are on separate providers. 2320 * At this point we have only one of them. 2321 * We setup a timeout in case the other part will not --- 737 unchanged lines hidden --- |