diff options
author | Rusty Russell <rusty@rustcorp.com.au> | 2011-06-20 18:40:31 +0930 |
---|---|---|
committer | Rusty Russell <rusty@rustcorp.com.au> | 2011-06-20 11:18:35 +0200 |
commit | d6251996fa5b8371c0f7449825b5d1788da95dd0 (patch) | |
tree | d2295fb5edffef971841c3220a6c1ce17af81808 /source3/lib/gencache.c | |
parent | 2b1452b2fc0573e09fedb7fbd8a5f8d278470b9c (diff) | |
download | samba-d6251996fa5b8371c0f7449825b5d1788da95dd0.tar.gz samba-d6251996fa5b8371c0f7449825b5d1788da95dd0.tar.bz2 samba-d6251996fa5b8371c0f7449825b5d1788da95dd0.zip |
tdb_transaction_cancel: ignore return value.
TDB2 returns void here. tdb_transaction_cancel will *always* return
with the transaction cancelled, but it will complain via the log
function if a transaction wasn't in progress.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Diffstat (limited to 'source3/lib/gencache.c')
-rw-r--r-- | source3/lib/gencache.c | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/source3/lib/gencache.c b/source3/lib/gencache.c index 62bad96fbb..ab7de21d92 100644 --- a/source3/lib/gencache.c +++ b/source3/lib/gencache.c @@ -489,18 +489,14 @@ bool gencache_stabilize(void) res = tdb_traverse(cache_notrans, stabilize_fn, &state); if ((res == -1) || state.error) { - if ((tdb_transaction_cancel(cache_notrans) == -1) - || (tdb_transaction_cancel(cache) == -1)) { - smb_panic("tdb_transaction_cancel failed\n"); - } + tdb_transaction_cancel(cache_notrans); + tdb_transaction_cancel(cache); return false; } if (!state.written) { - if ((tdb_transaction_cancel(cache_notrans) == -1) - || (tdb_transaction_cancel(cache) == -1)) { - smb_panic("tdb_transaction_cancel failed\n"); - } + tdb_transaction_cancel(cache_notrans); + tdb_transaction_cancel(cache); return true; } @@ -508,9 +504,7 @@ bool gencache_stabilize(void) if (res != 0) { DEBUG(10, ("tdb_transaction_commit on gencache.tdb failed: " "%s\n", tdb_errorstr(cache))); - if (tdb_transaction_cancel(cache_notrans) == -1) { - smb_panic("tdb_transaction_cancel failed\n"); - } + tdb_transaction_cancel(cache_notrans); return false; } |