| g_journal.c (269692) | g_journal.c (283291) |
|---|---|
| 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 269692 2014-08-07 21:56:42Z imp $"); | 28__FBSDID("$FreeBSD: head/sys/geom/journal/g_journal.c 283291 2015-05-22 17:05:21Z jkim $"); |
| 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> --- 2272 unchanged lines hidden (view full) --- 2309 sc->sc_copy_queue = NULL; 2310 sc->sc_copy_in_progress = 0; 2311 sc->sc_inactive.jj_queue = NULL; 2312 sc->sc_active.jj_queue = NULL; 2313 2314 sc->sc_rootmount = root_mount_hold("GJOURNAL"); 2315 GJ_DEBUG(1, "root_mount_hold %p", sc->sc_rootmount); 2316 | 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> --- 2272 unchanged lines hidden (view full) --- 2309 sc->sc_copy_queue = NULL; 2310 sc->sc_copy_in_progress = 0; 2311 sc->sc_inactive.jj_queue = NULL; 2312 sc->sc_active.jj_queue = NULL; 2313 2314 sc->sc_rootmount = root_mount_hold("GJOURNAL"); 2315 GJ_DEBUG(1, "root_mount_hold %p", sc->sc_rootmount); 2316 |
| 2317 callout_init(&sc->sc_callout, CALLOUT_MPSAFE); | 2317 callout_init(&sc->sc_callout, 1); |
| 2318 if (md->md_type != GJ_TYPE_COMPLETE) { 2319 /* 2320 * Journal and data are on separate providers. 2321 * At this point we have only one of them. 2322 * We setup a timeout in case the other part will not 2323 * appear, so we won't wait forever. 2324 */ 2325 callout_reset(&sc->sc_callout, 5 * hz, --- 723 unchanged lines hidden --- | 2318 if (md->md_type != GJ_TYPE_COMPLETE) { 2319 /* 2320 * Journal and data are on separate providers. 2321 * At this point we have only one of them. 2322 * We setup a timeout in case the other part will not 2323 * appear, so we won't wait forever. 2324 */ 2325 callout_reset(&sc->sc_callout, 5 * hz, --- 723 unchanged lines hidden --- |