diff options
| author | Volker Lendecke <vl@samba.org> | 2014-08-04 12:41:06 +0000 |
|---|---|---|
| committer | Amitay Isaacs <amitay@samba.org> | 2014-08-06 12:22:13 +0200 |
| commit | 9f596c17c7d255213df6201d4d489df1580faef4 (patch) | |
| tree | b6d87ffd558d8bcd988a2237433ce6540edcda66 | |
| parent | bb8e6d458a55510605da8768a302a81d2c2ce457 (diff) | |
| download | samba-9f596c17c7d255213df6201d4d489df1580faef4.tar.gz samba-9f596c17c7d255213df6201d4d489df1580faef4.tar.xz samba-9f596c17c7d255213df6201d4d489df1580faef4.zip | |
ctdb-locking: TALLOC_FREE copes with NULL
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
| -rw-r--r-- | ctdb/server/ctdb_lock.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/ctdb/server/ctdb_lock.c b/ctdb/server/ctdb_lock.c index a403e25573..a7df6cf680 100644 --- a/ctdb/server/ctdb_lock.c +++ b/ctdb/server/ctdb_lock.c @@ -432,9 +432,7 @@ static void ctdb_lock_handler(struct tevent_context *ev, lock_ctx = talloc_get_type_abort(private_data, struct lock_context); /* cancel the timeout event */ - if (lock_ctx->ttimer) { - TALLOC_FREE(lock_ctx->ttimer); - } + TALLOC_FREE(lock_ctx->ttimer); t = timeval_elapsed(&lock_ctx->start_time); id = lock_bucket_id(t); |