From d271dd50cda4844a487962a966d24eb96ebae8d3 Mon Sep 17 00:00:00 2001 From: Frank Lahm Date: Wed, 20 Apr 2011 14:34:31 +0200 Subject: [PATCH] fix --- etc/cnid_dbd/cmd_dbd_scanvol.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/etc/cnid_dbd/cmd_dbd_scanvol.c b/etc/cnid_dbd/cmd_dbd_scanvol.c index 588da0db..e86d1978 100644 --- a/etc/cnid_dbd/cmd_dbd_scanvol.c +++ b/etc/cnid_dbd/cmd_dbd_scanvol.c @@ -1258,10 +1258,10 @@ int cmd_dbd_scanvol(DBD *dbd_ref, struct volinfo *vi, dbd_flags_t flags) exit: if (! nocniddb) { - if (dbif_txn_close(dbd, 2) != 0) + if (dbif_txn_close(dbd, ret == 0 ? 1 : 0) != 0) ret = -1; if (dbd_rebuild) - if (dbif_txn_close(dbd_rebuild, 2) != 0) + if (dbif_txn_close(dbd_rebuild, ret == 0 ? 1 : 0) != 0) ret = -1; if ((ret == 0) && dbd_rebuild && (flags & DBD_FLAGS_EXCL) && !(flags & DBD_FLAGS_FORCE)) /* We can only do this in exclusive mode, otherwise we might delete CNIDs added from -- 2.39.2