Deleted Added
full compact
swap_pager.c (164033) swap_pager.c (165809)
1/*-
2 * Copyright (c) 1998 Matthew Dillon,
3 * Copyright (c) 1994 John S. Dyson
4 * Copyright (c) 1990 University of Utah.
5 * Copyright (c) 1982, 1986, 1989, 1993
6 * The Regents of the University of California. All rights reserved.
7 *
8 * This code is derived from software contributed to Berkeley by

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

62 *
63 * from: Utah $Hdr: swap_pager.c 1.4 91/04/30$
64 *
65 * @(#)swap_pager.c 8.9 (Berkeley) 3/21/94
66 * @(#)vm_swap.c 8.5 (Berkeley) 2/17/94
67 */
68
69#include <sys/cdefs.h>
1/*-
2 * Copyright (c) 1998 Matthew Dillon,
3 * Copyright (c) 1994 John S. Dyson
4 * Copyright (c) 1990 University of Utah.
5 * Copyright (c) 1982, 1986, 1989, 1993
6 * The Regents of the University of California. All rights reserved.
7 *
8 * This code is derived from software contributed to Berkeley by

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

62 *
63 * from: Utah $Hdr: swap_pager.c 1.4 91/04/30$
64 *
65 * @(#)swap_pager.c 8.9 (Berkeley) 3/21/94
66 * @(#)vm_swap.c 8.5 (Berkeley) 2/17/94
67 */
68
69#include <sys/cdefs.h>
70__FBSDID("$FreeBSD: head/sys/vm/swap_pager.c 164033 2006-11-06 13:42:10Z rwatson $");
70__FBSDID("$FreeBSD: head/sys/vm/swap_pager.c 165809 2007-01-05 19:09:01Z jhb $");
71
72#include "opt_mac.h"
73#include "opt_swap.h"
74#include "opt_vm.h"
75
76#include <sys/param.h>
77#include <sys/systm.h>
78#include <sys/conf.h>

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

1741
1742 if (swapblk == SWAPBLK_NONE)
1743 goto done;
1744
1745 swap = *pswap = uma_zalloc(swap_zone, M_NOWAIT);
1746 if (swap == NULL) {
1747 mtx_unlock(&swhash_mtx);
1748 VM_OBJECT_UNLOCK(object);
71
72#include "opt_mac.h"
73#include "opt_swap.h"
74#include "opt_vm.h"
75
76#include <sys/param.h>
77#include <sys/systm.h>
78#include <sys/conf.h>

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

1741
1742 if (swapblk == SWAPBLK_NONE)
1743 goto done;
1744
1745 swap = *pswap = uma_zalloc(swap_zone, M_NOWAIT);
1746 if (swap == NULL) {
1747 mtx_unlock(&swhash_mtx);
1748 VM_OBJECT_UNLOCK(object);
1749 if (uma_zone_exhausted(swap_zone))
1750 printf("swap zone exhausted, increase kern.maxswzone\n");
1749 VM_WAIT;
1750 VM_OBJECT_LOCK(object);
1751 goto retry;
1752 }
1753
1754 swap->swb_hnext = NULL;
1755 swap->swb_object = object;
1756 swap->swb_index = pindex & ~(vm_pindex_t)SWAP_META_MASK;

--- 818 unchanged lines hidden ---
1751 VM_WAIT;
1752 VM_OBJECT_LOCK(object);
1753 goto retry;
1754 }
1755
1756 swap->swb_hnext = NULL;
1757 swap->swb_object = object;
1758 swap->swb_index = pindex & ~(vm_pindex_t)SWAP_META_MASK;

--- 818 unchanged lines hidden ---