summaryrefslogtreecommitdiff
path: root/src/qam/qam_files.c
diff options
context:
space:
mode:
authorLorry Tar Creator <lorry-tar-importer@baserock.org>2015-02-17 17:25:57 +0000
committer <>2015-03-17 16:26:24 +0000
commit780b92ada9afcf1d58085a83a0b9e6bc982203d1 (patch)
tree598f8b9fa431b228d29897e798de4ac0c1d3d970 /src/qam/qam_files.c
parent7a2660ba9cc2dc03a69ddfcfd95369395cc87444 (diff)
downloadberkeleydb-master.tar.gz
Imported from /home/lorry/working-area/delta_berkeleydb/db-6.1.23.tar.gz.HEADdb-6.1.23master
Diffstat (limited to 'src/qam/qam_files.c')
-rw-r--r--src/qam/qam_files.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/src/qam/qam_files.c b/src/qam/qam_files.c
index e9a9ff07..f5c7d2ec 100644
--- a/src/qam/qam_files.c
+++ b/src/qam/qam_files.c
@@ -1,7 +1,7 @@
/*-
* See the file LICENSE for redistribution information.
*
- * Copyright (c) 1999, 2012 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2015 Oracle and/or its affiliates. All rights reserved.
*
* $Id$
*/
@@ -445,6 +445,8 @@ __qam_fremove(dbp, pgnoaddr)
* sizeof(array->mpfarray[0]));
array->mpfarray[
array->hi_extent - array->low_extent].mpf = NULL;
+ array->mpfarray[
+ array->hi_extent - array->low_extent].pinref = 0;
if (array->low_extent != array->hi_extent)
array->low_extent++;
} else {
@@ -570,8 +572,11 @@ again:
for (i = first; i >= first && i <= stop; i += rec_extent) {
if ((ret = __qam_fprobe(dbc, QAM_RECNO_PAGE(dbp, i),
&fp->mpf, QAM_PROBE_MPF, dbp->priority, 0)) != 0) {
- if (ret == ENOENT)
+ if (ret == ENOENT) {
+ /* Missing extents are acceptable; skip them. */
+ ret = 0;
continue;
+ }
goto err;
}
fp->id = QAM_RECNO_EXTENT(dbp, i);