diff options
| author | Niels de Vos <ndevos@redhat.com> | 2017-07-29 14:16:07 +0200 |
|---|---|---|
| committer | Shyamsundar Ranganathan <srangana@redhat.com> | 2017-08-11 11:22:43 +0000 |
| commit | dc413d4126d02be71a014786e17e7b605443e887 (patch) | |
| tree | 123dd8459dcb8100c53089443ef6574a6d7018a1 /xlators | |
| parent | cfa33b224f58053bbbcbc46865fca70621a59f05 (diff) | |
refcount: typecast function for calling on free
All of the functions called to free the refcounted structure are doing a
typecast from (void*) to their own type taht is being free'd. This
really is not needed and the refcount interface is made a little simpler
without the requirement of typecasting.
With this small improvement in the API, all callers are updated too.
Cherry picked from commit f2ca301bd741e3e3f076cd3f72fcd377bcef2a1a:
> Change-Id: I32473b6d1799f62861d4b2d78ea30c09e6c80ab1
> BUG: 1416889
> Signed-off-by: Niels de Vos <ndevos@redhat.com>
> Reviewed-on: https://review.gluster.org/16471
> Smoke: Gluster Build System <jenkins@build.gluster.org>
> NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
> Reviewed-by: Xavier Hernandez <xhernandez@datalab.es>
> CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
> Reviewed-by: Kaleb KEITHLEY <kkeithle@redhat.com>
Backport note: This patch makes it easier to backport changes that use
gf_refcount_t. There is no functional change.
Change-Id: I32473b6d1799f62861d4b2d78ea30c09e6c80ab1
BUG: 1471870
Signed-off-by: Niels de Vos <ndevos@redhat.com>
Reviewed-on: https://review.gluster.org/17913
Smoke: Gluster Build System <jenkins@build.gluster.org>
CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
Reviewed-by: Shyamsundar Ranganathan <srangana@redhat.com>
Diffstat (limited to 'xlators')
| -rw-r--r-- | xlators/cluster/dht/src/dht-helper.c | 9 | ||||
| -rw-r--r-- | xlators/features/marker/src/marker-quota-helper.c | 6 | ||||
| -rw-r--r-- | xlators/features/marker/src/marker-quota-helper.h | 3 |
3 files changed, 4 insertions, 14 deletions
diff --git a/xlators/cluster/dht/src/dht-helper.c b/xlators/cluster/dht/src/dht-helper.c index c9bf60eb591..55f86075f5e 100644 --- a/xlators/cluster/dht/src/dht-helper.c +++ b/xlators/cluster/dht/src/dht-helper.c @@ -15,15 +15,10 @@ #include "dht-helper.h" -void -dht_free_fd_ctx (void *data) +static void +dht_free_fd_ctx (dht_fd_ctx_t *fd_ctx) { - dht_fd_ctx_t *fd_ctx = NULL; - - fd_ctx = (dht_fd_ctx_t *)data; GF_FREE (fd_ctx); - - return; } diff --git a/xlators/features/marker/src/marker-quota-helper.c b/xlators/features/marker/src/marker-quota-helper.c index 1fed9df6d6a..e3e218f8af5 100644 --- a/xlators/features/marker/src/marker-quota-helper.c +++ b/xlators/features/marker/src/marker-quota-helper.c @@ -146,11 +146,9 @@ out: return ctx; } -void -mq_contri_fini (void *data) +static void +mq_contri_fini (inode_contribution_t *contri) { - inode_contribution_t *contri = data; - LOCK_DESTROY (&contri->lock); GF_FREE (contri); } diff --git a/xlators/features/marker/src/marker-quota-helper.h b/xlators/features/marker/src/marker-quota-helper.h index bf417aa8241..444ba7ca71e 100644 --- a/xlators/features/marker/src/marker-quota-helper.h +++ b/xlators/features/marker/src/marker-quota-helper.h @@ -66,9 +66,6 @@ mq_local_ref (quota_local_t *); int32_t mq_local_unref (xlator_t *, quota_local_t *); -void -mq_contri_fini (void *data); - inode_contribution_t* mq_contri_init (inode_t *inode); |