diff options
| author | Andrew Tridgell <tridge@samba.org> | 2007-04-21 07:23:42 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:51:17 -0500 |
| commit | 650d81b252cc669ef848448afad7e9bb79c4f20e (patch) | |
| tree | 7108ada18c4d7fff581470791832850c17eab6bf /source4/cluster/ctdb/opendb_ctdb.c | |
| parent | 66a9f1e2764900a2c22a4bfad9f9caf3db729385 (diff) | |
| download | samba-650d81b252cc669ef848448afad7e9bb79c4f20e.tar.gz samba-650d81b252cc669ef848448afad7e9bb79c4f20e.tar.bz2 samba-650d81b252cc669ef848448afad7e9bb79c4f20e.zip | |
r22421: merged in latest ctdb changes from bzr
(This used to be commit 3633f862b966866819c9a0a6ad0238a858e15e62)
Diffstat (limited to 'source4/cluster/ctdb/opendb_ctdb.c')
| -rw-r--r-- | source4/cluster/ctdb/opendb_ctdb.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/source4/cluster/ctdb/opendb_ctdb.c b/source4/cluster/ctdb/opendb_ctdb.c index 6e2748291e..df399515eb 100644 --- a/source4/cluster/ctdb/opendb_ctdb.c +++ b/source4/cluster/ctdb/opendb_ctdb.c @@ -223,7 +223,8 @@ static NTSTATUS odb_push_record(struct odb_lock *lck, struct opendb_file *file) if (!file->num_entries) { dbuf.dptr = NULL; dbuf.dsize = 0; - ctdb_store_unlock(lck->rec, dbuf); + ctdb_record_store(lck->rec, dbuf); + talloc_free(lck->rec); return NT_STATUS_OK; } @@ -233,7 +234,8 @@ static NTSTATUS odb_push_record(struct odb_lock *lck, struct opendb_file *file) dbuf.dptr = blob.data; dbuf.dsize = blob.length; - ret = ctdb_store_unlock(lck->rec, dbuf); + ret = ctdb_record_store(lck->rec, dbuf); + talloc_free(lck->rec); data_blob_free(&blob); if (ret != 0) { return NT_STATUS_INTERNAL_DB_CORRUPTION; |