svn commit: r216873 - head/sys/vm

Bruce Cran brucec at FreeBSD.org
Sat Jan 1 16:59:06 UTC 2011


Author: brucec
Date: Sat Jan  1 16:59:05 2011
New Revision: 216873
URL: http://svn.freebsd.org/changeset/base/216873

Log:
  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
  Discussed with:	kib
  MFC after:	3 days

Modified:
  head/sys/vm/swap_pager.c

Modified: head/sys/vm/swap_pager.c
==============================================================================
--- head/sys/vm/swap_pager.c	Sat Jan  1 16:47:12 2011	(r216872)
+++ head/sys/vm/swap_pager.c	Sat Jan  1 16:59:05 2011	(r216873)
@@ -1679,8 +1679,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);
@@ -1995,8 +1993,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-head mailing list