X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;ds=sidebyside;f=ccan%2Ftdb2%2Fopen.c;h=fec3ef1596a562c90c6c40588265b0e05c93ed20;hb=77658070a3e4f712b94d659b2e399031ce3394c8;hp=c3feecf73f34acfd08cabbd81570dd1883ddebc4;hpb=72e974b25a04a72a1123501aafbb3b5d39019d42;p=ccan
diff --git a/ccan/tdb2/open.c b/ccan/tdb2/open.c
index c3feecf7..fec3ef15 100644
--- a/ccan/tdb2/open.c
+++ b/ccan/tdb2/open.c
@@ -1,3 +1,20 @@
+ /*
+ Trivial Database 2: opening and closing TDBs
+ Copyright (C) Rusty Russell 2010
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 3 of the License, or (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, see .
+*/
#include "private.h"
#include
#include
@@ -333,6 +350,7 @@ struct tdb_context *tdb_open(const char *name, int tdb_flags,
struct tdb_attribute_openhook *openhook = NULL;
tdb_bool_err berr;
enum TDB_ERROR ecode;
+ int openlock;
tdb = malloc(sizeof(*tdb) + (name ? strlen(name) + 1 : 0));
if (!tdb) {
@@ -399,9 +417,11 @@ struct tdb_context *tdb_open(const char *name, int tdb_flags,
if ((open_flags & O_ACCMODE) == O_RDONLY) {
tdb->read_only = true;
tdb->mmap_flags = PROT_READ;
+ openlock = F_RDLCK;
} else {
tdb->read_only = false;
tdb->mmap_flags = PROT_READ | PROT_WRITE;
+ openlock = F_WRLCK;
}
/* internal databases don't need any of the rest. */
@@ -446,12 +466,15 @@ struct tdb_context *tdb_open(const char *name, int tdb_flags,
tdb_logerr(tdb, TDB_ERR_IO, TDB_LOG_ERROR,
"tdb_open: could not stat open %s: %s",
name, strerror(errno));
+ close(fd);
goto fail_errno;
}
ecode = tdb_new_file(tdb);
- if (ecode != TDB_SUCCESS)
+ if (ecode != TDB_SUCCESS) {
+ close(fd);
goto fail;
+ }
tdb->file->next = files;
tdb->file->fd = fd;
@@ -462,7 +485,7 @@ struct tdb_context *tdb_open(const char *name, int tdb_flags,
}
/* ensure there is only one process initialising at once */
- ecode = tdb_lock_open(tdb, TDB_LOCK_WAIT|TDB_LOCK_NOCHECK);
+ ecode = tdb_lock_open(tdb, openlock, TDB_LOCK_WAIT|TDB_LOCK_NOCHECK);
if (ecode != TDB_SUCCESS) {
saved_errno = errno;
goto fail_errno;
@@ -527,17 +550,20 @@ struct tdb_context *tdb_open(const char *name, int tdb_flags,
/* Clear any features we don't understand. */
if ((open_flags & O_ACCMODE) != O_RDONLY) {
hdr.features_used &= TDB_FEATURE_MASK;
- if (tdb_write_convert(tdb, offsetof(struct tdb_header,
- features_used),
- &hdr.features_used,
- sizeof(hdr.features_used)) == -1)
+ ecode = tdb_write_convert(tdb, offsetof(struct tdb_header,
+ features_used),
+ &hdr.features_used,
+ sizeof(hdr.features_used));
+ if (ecode != TDB_SUCCESS)
goto fail;
}
- tdb_unlock_open(tdb);
+ tdb_unlock_open(tdb, openlock);
/* This make sure we have current map_size and mmap. */
- tdb->methods->oob(tdb, tdb->file->map_size + 1, true);
+ ecode = tdb->methods->oob(tdb, tdb->file->map_size + 1, true);
+ if (unlikely(ecode != TDB_SUCCESS))
+ goto fail;
/* Now it's fully formed, recover if necessary. */
berr = tdb_needs_recovery(tdb);