diff options
| author | Volker Lendecke <vlendec@samba.org> | 2007-02-12 23:16:02 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:48:06 -0500 |
| commit | 2acd8a9b3e1bd3885c5865e4b44ac3b4d92655d3 (patch) | |
| tree | 9069bf607da93d19ec8608dd0d1dd41f154ce0ea /source4/lib/tdb/common/open.c | |
| parent | 4126b34e1f34a67b1eed06329530c17dfa54fb00 (diff) | |
| download | samba-2acd8a9b3e1bd3885c5865e4b44ac3b4d92655d3.tar.gz samba-2acd8a9b3e1bd3885c5865e4b44ac3b4d92655d3.tar.bz2 samba-2acd8a9b3e1bd3885c5865e4b44ac3b4d92655d3.zip | |
r21303: As discussed on samba-technical: Change the static array for the in-memory
mirrors of the hash chain locks to a dynamically allocated one.
Jeremy, I count on you to revert it if the build farm freaks out, it's after
midnight here :-)
Volker
(This used to be commit 7b5db2e472c7e27231fa432d3930789e708abd09)
Diffstat (limited to 'source4/lib/tdb/common/open.c')
| -rw-r--r-- | source4/lib/tdb/common/open.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/source4/lib/tdb/common/open.c b/source4/lib/tdb/common/open.c index e1f21aa856..3d6e222b96 100644 --- a/source4/lib/tdb/common/open.c +++ b/source4/lib/tdb/common/open.c @@ -263,15 +263,6 @@ struct tdb_context *tdb_open_ex(const char *name, int hash_size, int tdb_flags, tdb->map_size = st.st_size; tdb->device = st.st_dev; tdb->inode = st.st_ino; - tdb->locked = (struct tdb_lock_type *)calloc(tdb->header.hash_size+1, - sizeof(tdb->locked[0])); - if (!tdb->locked) { - TDB_LOG((tdb, TDB_DEBUG_ERROR, "tdb_open_ex: " - "failed to allocate lock structure for %s\n", - name)); - errno = ENOMEM; - goto fail; - } tdb_mmap(tdb); if (locked) { if (tdb->methods->tdb_brlock(tdb, ACTIVE_LOCK, F_UNLCK, F_SETLK, 0, 1) == -1) { @@ -324,7 +315,6 @@ struct tdb_context *tdb_open_ex(const char *name, int hash_size, int tdb_flags, if (tdb->fd != -1) if (close(tdb->fd) != 0) TDB_LOG((tdb, TDB_DEBUG_ERROR, "tdb_open_ex: failed to close tdb->fd on error!\n")); - SAFE_FREE(tdb->locked); SAFE_FREE(tdb); errno = save_errno; return NULL; @@ -354,7 +344,7 @@ int tdb_close(struct tdb_context *tdb) SAFE_FREE(tdb->name); if (tdb->fd != -1) ret = close(tdb->fd); - SAFE_FREE(tdb->locked); + SAFE_FREE(tdb->lockrecs); /* Remove from contexts list */ for (i = &tdbs; *i; i = &(*i)->next) { |