Deleted Added
full compact
g_journal.c (163875) g_journal.c (163886)
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 163875 2006-11-01 14:09:59Z pjd $");
28__FBSDID("$FreeBSD: head/sys/geom/journal/g_journal.c 163886 2006-11-01 22:16:53Z pjd $");
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>

--- 2863 unchanged lines hidden (view full) ---

2900 }
2901
2902 mountpoint = mp->mnt_stat.f_mntonname;
2903
2904 vfslocked = VFS_LOCK_GIANT(mp);
2905
2906 error = vn_start_write(NULL, &mp, V_WAIT);
2907 if (error != 0) {
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>

--- 2863 unchanged lines hidden (view full) ---

2900 }
2901
2902 mountpoint = mp->mnt_stat.f_mntonname;
2903
2904 vfslocked = VFS_LOCK_GIANT(mp);
2905
2906 error = vn_start_write(NULL, &mp, V_WAIT);
2907 if (error != 0) {
2908 VFS_UNLOCK_GIANT(vfslocked);
2908 VFS_UNLOCK_GIANT(vfslocked);
2909 GJ_DEBUG(0, "vn_start_write(%s) failed (error=%d).",
2910 mountpoint, error);
2911 goto next;
2912 }
2913
2914 MNT_ILOCK(mp);
2915 mp->mnt_noasync++;
2916 mp->mnt_kern_flag &= ~MNTK_ASYNC;

--- 125 unchanged lines hidden ---
2909 GJ_DEBUG(0, "vn_start_write(%s) failed (error=%d).",
2910 mountpoint, error);
2911 goto next;
2912 }
2913
2914 MNT_ILOCK(mp);
2915 mp->mnt_noasync++;
2916 mp->mnt_kern_flag &= ~MNTK_ASYNC;

--- 125 unchanged lines hidden ---