Merge branch 'linus' into smp/hotplug

Apply upstream changes to avoid conflicts with pending patches.

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);