From d2f713bbd1dc6ed6801614bc37160ae80f0864d5 Mon Sep 17 00:00:00 2001 From: christos Date: Wed, 31 Aug 2016 06:23:51 +0000 Subject: [PATCH] don't shortcut closing if the metadata is dirty (from the krb5 tree) --- lib/libc/db/btree/bt_close.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/libc/db/btree/bt_close.c b/lib/libc/db/btree/bt_close.c index a085952e07c8..ae2fb91bb799 100644 --- a/lib/libc/db/btree/bt_close.c +++ b/lib/libc/db/btree/bt_close.c @@ -1,4 +1,4 @@ -/* $NetBSD: bt_close.c,v 1.14 2008/09/11 12:58:00 joerg Exp $ */ +/* $NetBSD: bt_close.c,v 1.15 2016/08/31 06:23:51 christos Exp $ */ /*- * Copyright (c) 1990, 1993, 1994 @@ -37,7 +37,7 @@ #endif #include -__RCSID("$NetBSD: bt_close.c,v 1.14 2008/09/11 12:58:00 joerg Exp $"); +__RCSID("$NetBSD: bt_close.c,v 1.15 2016/08/31 06:23:51 christos Exp $"); #include "namespace.h" @@ -136,7 +136,8 @@ __bt_sync(const DB *dbp, u_int flags) return (RET_ERROR); } - if (F_ISSET(t, B_INMEM | B_RDONLY) || !F_ISSET(t, B_MODIFIED)) + if (F_ISSET(t, B_INMEM | B_RDONLY) + || !F_ISSET(t, B_MODIFIED | B_METADIRTY)) return (RET_SUCCESS); if (F_ISSET(t, B_METADIRTY) && bt_meta(t) == RET_ERROR)