diff options
author | Mark Storer <Mark.Storer@evault.com> | 2014-08-16 14:53:12 -0700 |
---|---|---|
committer | Mark Storer <Mark.Storer@evault.com> | 2014-08-16 14:53:12 -0700 |
commit | 9c6ba636ec1dbd931c69ef93b28534d1ab9f3925 (patch) | |
tree | d0d64e355a4e14c78c320ac6465a7193cd3c39b7 | |
parent | c22312f2d00ae56db499ae142656692a8750e3c9 (diff) | |
download | liberasurecode-9c6ba636ec1dbd931c69ef93b28534d1ab9f3925.tar.gz |
Updated the backend instance register/unregister methods with lock
status checking. This shouldn't be an issue, but technically, lock
requests can fail and so should check the return calls out of good
practice.
-rw-r--r-- | src/erasurecode.c | 40 |
1 files changed, 28 insertions, 12 deletions
diff --git a/src/erasurecode.c b/src/erasurecode.c index aedbae3..8a415c9 100644 --- a/src/erasurecode.c +++ b/src/erasurecode.c @@ -131,30 +131,46 @@ int liberasurecode_backend_alloc_desc(void) */ int liberasurecode_backend_instance_register(ec_backend_t instance) { - int desc = -1; - - rwlock_wrlock(&active_instances_rwlock); - SLIST_INSERT_HEAD(&active_instances, instance, link); - desc = liberasurecode_backend_alloc_desc(); - if (desc <= 0) - goto register_out; - instance->idesc = desc; + int desc = -1; /* descriptor to return */ + int rc = 0; /* return call value */ + + rc = rwlock_wrlock(&active_instances_rwlock); + if (rc == 0) { + SLIST_INSERT_HEAD(&active_instances, instance, link); + desc = liberasurecode_backend_alloc_desc(); + if (desc <= 0) + goto register_out; + instance->idesc = desc; + } else { + goto exit; + } register_out: rwlock_unlock(&active_instances_rwlock); +exit: return desc; } /** * Unregister a backend instance + * + * @returns 0 on success, non-0 on error */ int liberasurecode_backend_instance_unregister(ec_backend_t instance) { - rwlock_wrlock(&active_instances_rwlock); - SLIST_REMOVE(&active_instances, instance, ec_backend, link); - rwlock_unlock(&active_instances_rwlock); + int rc = 0; /* return call value */ + + rc = rwlock_wrlock(&active_instances_rwlock); + if (rc == 0) { + SLIST_REMOVE(&active_instances, instance, ec_backend, link); + } else { + goto exit; + } - return 0; +register_out: + rwlock_unlock(&active_instances_rwlock); +exit: + return rc; } /* =~=*=~==~=*=~== liberasurecode backend API helpers =~=*=~==~=*=~== */ |