1 files changed, 14 insertions, 18 deletions

diff --git a/kernel/rcu/srcutree.c b/kernel/rcu/srcutree.c
index a60b8ba9e1ac..9b761e546de8 100644
--- a/kernel/rcu/srcutree.c
+++ b/kernel/rcu/srcutree.c
@@ -360,8 +360,14 @@ static unsigned long srcu_get_delay(struct srcu_struct *ssp)
         return SRCU_INTERVAL;
 }
 
-/* Helper for cleanup_srcu_struct() and cleanup_srcu_struct_quiesced(). */
-void _cleanup_srcu_struct(struct srcu_struct *ssp, bool quiesced)
+/**
+ * cleanup_srcu_struct - deconstruct a sleep-RCU structure
+ * @ssp: structure to clean up.
+ *
+ * Must invoke this after you are finished using a given srcu_struct that
+ * was initialized via init_srcu_struct(), else you leak memory.
+ */
+void cleanup_srcu_struct(struct srcu_struct *ssp)
 {
         int cpu;
 
@@ -369,24 +375,14 @@ void _cleanup_srcu_struct(struct srcu_struct *ssp, bool quiesced)
                 return; /* Just leak it! */
         if (WARN_ON(srcu_readers_active(ssp)))
                 return; /* Just leak it! */
-        if (quiesced) {
-                if (WARN_ON(delayed_work_pending(&ssp->work)))
-                        return; /* Just leak it! */
-        } else {
-                flush_delayed_work(&ssp->work);
-        }
+        flush_delayed_work(&ssp->work);
         for_each_possible_cpu(cpu) {
                 struct srcu_data *sdp = per_cpu_ptr(ssp->sda, cpu);
 
-                if (quiesced) {
-                        if (WARN_ON(timer_pending(&sdp->delay_work)))
-                                return; /* Just leak it! */
-                        if (WARN_ON(work_pending(&sdp->work)))
-                                return; /* Just leak it! */
-                } else {
-                        del_timer_sync(&sdp->delay_work);
-                        flush_work(&sdp->work);
-                }
+                del_timer_sync(&sdp->delay_work);
+                flush_work(&sdp->work);
+                if (WARN_ON(rcu_segcblist_n_cbs(&sdp->srcu_cblist)))
+                        return; /* Forgot srcu_barrier(), so just leak it! */
         }
         if (WARN_ON(rcu_seq_state(READ_ONCE(ssp->srcu_gp_seq)) != SRCU_STATE_IDLE) ||
             WARN_ON(srcu_readers_active(ssp))) {
@@ -397,7 +393,7 @@ void _cleanup_srcu_struct(struct srcu_struct *ssp, bool quiesced)
         free_percpu(ssp->sda);
         ssp->sda = NULL;
 }
-EXPORT_SYMBOL_GPL(_cleanup_srcu_struct);
+EXPORT_SYMBOL_GPL(cleanup_srcu_struct);
 
 /*
  * Counts the new reader in the appropriate per-CPU element of the