diff options
Diffstat (limited to 'libglusterfs/src/refcount.c')
| -rw-r--r-- | libglusterfs/src/refcount.c | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/libglusterfs/src/refcount.c b/libglusterfs/src/refcount.c index 96edc10982a..9d33b733cf0 100644 --- a/libglusterfs/src/refcount.c +++ b/libglusterfs/src/refcount.c @@ -13,7 +13,7 @@ #ifndef REFCOUNT_NEEDS_LOCK -unsigned int +void * _gf_ref_get (gf_ref_t *ref) { unsigned int cnt = __sync_fetch_and_add (&ref->cnt, 1); @@ -27,10 +27,10 @@ _gf_ref_get (gf_ref_t *ref) */ GF_ASSERT (cnt != 0); - return cnt; + return cnt ? ref->data : NULL; } -unsigned int +void _gf_ref_put (gf_ref_t *ref) { unsigned int cnt = __sync_fetch_and_sub (&ref->cnt, 1); @@ -43,18 +43,13 @@ _gf_ref_put (gf_ref_t *ref) */ GF_ASSERT (cnt != 0); - if (cnt == 1 && ref->release) { + if (cnt == 1 && ref->release) ref->release (ref->data); - /* set return value to 0 to inform the caller correctly */ - cnt = 0; - } - - return cnt; } #else -unsigned int +void * _gf_ref_get (gf_ref_t *ref) { unsigned int cnt = 0; @@ -69,10 +64,10 @@ _gf_ref_get (gf_ref_t *ref) } UNLOCK (&ref->lk); - return cnt; + return cnt ? ref->data : NULL; } -unsigned int +void _gf_ref_put (gf_ref_t *ref) { unsigned int cnt = 0; @@ -91,8 +86,6 @@ _gf_ref_put (gf_ref_t *ref) if (release && ref->release) ref->release (ref->data); - - return cnt; } #endif /* REFCOUNT_NEEDS_LOCK */ |