svn commit: r218261 - stable/7/sys/vm
Bruce Cran
brucec at FreeBSD.org
Fri Feb 4 10:22:19 UTC 2011
Author: brucec
Date: Fri Feb 4 10:22:19 2011
New Revision: 218261
URL: http://svn.freebsd.org/changeset/base/218261
Log:
MFC r216873:
There can be more than 0x20000000 swap meta blocks allocated if a swap-backed
md(4) device is used. Don't panic when deallocating such a device is swap
has been used.
PR: kern/133170
Modified:
stable/7/sys/vm/swap_pager.c
Directory Properties:
stable/7/sys/ (props changed)
stable/7/sys/cddl/contrib/opensolaris/ (props changed)
stable/7/sys/contrib/dev/acpica/ (props changed)
stable/7/sys/contrib/pf/ (props changed)
Modified: stable/7/sys/vm/swap_pager.c
==============================================================================
--- stable/7/sys/vm/swap_pager.c Fri Feb 4 10:21:16 2011 (r218260)
+++ stable/7/sys/vm/swap_pager.c Fri Feb 4 10:22:19 2011 (r218261)
@@ -1528,8 +1528,6 @@ swap_pager_isswapped(vm_object_t object,
}
}
index += SWAP_META_PAGES;
- if (index > 0x20000000)
- panic("swap_pager_isswapped: failed to locate all swap meta blocks");
}
mtx_unlock(&swhash_mtx);
return (0);
@@ -1844,8 +1842,6 @@ swp_pager_meta_free_all(vm_object_t obje
}
mtx_unlock(&swhash_mtx);
index += SWAP_META_PAGES;
- if (index > 0x20000000)
- panic("swp_pager_meta_free_all: failed to locate all swap meta blocks");
}
}
More information about the svn-src-stable-7
mailing list