Browse Source

MT#56447 fix locking errors

Fixup for df3bd8752

Change-Id: Ie81e90220f28a01e5aa2e4dc5287a57cbe879bd5
Warned-by: Coverity
pull/1642/head
Richard Fuchs 3 years ago
parent
commit
a758d52a86
1 changed files with 6 additions and 12 deletions
  1. +6
    -12
      daemon/redis.c

+ 6
- 12
daemon/redis.c View File

@ -2672,10 +2672,8 @@ void redis_update_onekey(struct call *c, struct redis *r) {
LOCK(&r->lock); LOCK(&r->lock);
// coverity[sleep : FALSE] // coverity[sleep : FALSE]
if (redis_check_conn(r) == REDIS_STATE_DISCONNECTED) {
mutex_unlock(&r->lock);
return ;
}
if (redis_check_conn(r) == REDIS_STATE_DISCONNECTED)
return;
rwlock_lock_r(&c->master_lock); rwlock_lock_r(&c->master_lock);
@ -2728,10 +2726,8 @@ void redis_delete(struct call *c, struct redis *r) {
LOCK(&r->lock); LOCK(&r->lock);
// coverity[sleep : FALSE] // coverity[sleep : FALSE]
if (redis_check_conn(r) == REDIS_STATE_DISCONNECTED) {
mutex_unlock(&r->lock);
return ;
}
if (redis_check_conn(r) == REDIS_STATE_DISCONNECTED)
return;
rwlock_lock_r(&c->master_lock); rwlock_lock_r(&c->master_lock);
if (redis_select_db(r, c->redis_hosted_db)) if (redis_select_db(r, c->redis_hosted_db))
@ -2761,9 +2757,7 @@ void redis_wipe(struct redis *r) {
LOCK(&r->lock); LOCK(&r->lock);
// coverity[sleep : FALSE] // coverity[sleep : FALSE]
if (redis_check_conn(r) == REDIS_STATE_DISCONNECTED) {
mutex_unlock(&r->lock);
return ;
}
if (redis_check_conn(r) == REDIS_STATE_DISCONNECTED)
return;
redisCommandNR(r->ctx, "DEL calls"); redisCommandNR(r->ctx, "DEL calls");
} }

Loading…
Cancel
Save