From 61619b3142c1de8f60f91964ff2656054d4f11a6 Mon Sep 17 00:00:00 2001 From: Antonin Kral Date: Thu, 10 May 2012 06:57:54 +0200 Subject: Imported Upstream version 2.0.5 --- db/pdfile.cpp | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'db/pdfile.cpp') diff --git a/db/pdfile.cpp b/db/pdfile.cpp index ac7731a..60914d9 100644 --- a/db/pdfile.cpp +++ b/db/pdfile.cpp @@ -434,6 +434,7 @@ namespace mongo { } Extent* MongoDataFile::createExtent(const char *ns, int approxSize, bool newCapped, int loops) { + assert( approxSize <= Extent::maxSize() ); { // make sizes align with VM page size int newSize = (approxSize + 0xfff) & 0xfffff000; @@ -491,6 +492,10 @@ namespace mongo { // overflowed high = max(approxSize, Extent::maxSize()); } + if ( high <= Extent::minSize() ) { + // the minimum extent size is 4097 + high = Extent::minSize() + 1; + } int n = 0; Extent *best = 0; int bestDiff = 0x7fffffff; -- cgit v1.2.3