svn commit: r218259 - stable/8/sys/vm

[Bruce Cran]

Author: brucec
Date: Fri Feb  4 10:19:56 2011
New Revision: 218259
URL: http://svn.freebsd.org/changeset/base/218259

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 if swap
  has been used.
  
  PR:	kern/133170

Modified:
  stable/8/sys/vm/swap_pager.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)

Modified: stable/8/sys/vm/swap_pager.c
==============================================================================
--- stable/8/sys/vm/swap_pager.c	Fri Feb  4 09:15:23 2011	(r218258)
+++ stable/8/sys/vm/swap_pager.c	Fri Feb  4 10:19:56 2011	(r218259)
@@ -1668,8 +1668,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);
@@ -1984,8 +1982,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");
 	}
 }