summaryrefslogtreecommitdiff
path: root/net/ceph/string_table.c
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2016-08-22 10:34:13 +0200
committerThomas Gleixner <tglx@linutronix.de>2016-08-22 10:34:13 +0200
commitd16c995fe43021c765186bf8b9f7e1cc4b043232 (patch)
tree67eed481534bc6c7102110e65ab4c6ee9e0b786a /net/ceph/string_table.c
parentf3b0946d629c8bfbd3e5f038e30cb9c711a35f10 (diff)
parent7611da865c1060b2a7c87a15de663a59035747f8 (diff)
Merge tag 'irqchip-for-4.8-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms into irq/urgent
Pull genirq/irqchip fixes for 4.8-rc4 from Marc Zygnier - A critical fix for chained irqchip where we failed to configure the cascade interrupt trigger - A GIC fix for self-IPI in SMP-on-UP configurations - A PM fix for GICv3 - A initialization fix the the GICv3 ITS, triggered by kexec
Diffstat (limited to 'net/ceph/string_table.c')
-rw-r--r--net/ceph/string_table.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/net/ceph/string_table.c b/net/ceph/string_table.c
index ca53c8319209..22fb96efcf34 100644
--- a/net/ceph/string_table.c
+++ b/net/ceph/string_table.c
@@ -84,12 +84,6 @@ retry:
}
EXPORT_SYMBOL(ceph_find_or_create_string);
-static void ceph_free_string(struct rcu_head *head)
-{
- struct ceph_string *cs = container_of(head, struct ceph_string, rcu);
- kfree(cs);
-}
-
void ceph_release_string(struct kref *ref)
{
struct ceph_string *cs = container_of(ref, struct ceph_string, kref);
@@ -101,7 +95,7 @@ void ceph_release_string(struct kref *ref)
}
spin_unlock(&string_tree_lock);
- call_rcu(&cs->rcu, ceph_free_string);
+ kfree_rcu(cs, rcu);
}
EXPORT_SYMBOL(ceph_release_string);