btrfs: fix race between quota disable and quota assign ioctls

[platform/kernel/linux-rpi.git] / lib / debugobjects.c

diff --git a/lib/debugobjects.c b/lib/debugobjects.c
index 6946f8e..793c31b 100644 (file)
--- a/lib/debugobjects.c
+++ b/lib/debugobjects.c
@@ -440,6 +440,7 @@ static int object_cpu_offline(unsigned int cpu)
        struct debug_percpu_free *percpu_pool;
        struct hlist_node *tmp;
        struct debug_obj *obj;
+       unsigned long flags;
 
        /* Remote access is safe as the CPU is dead already */
        percpu_pool = per_cpu_ptr(&percpu_obj_pool, cpu);
@@ -447,6 +448,12 @@ static int object_cpu_offline(unsigned int cpu)
                hlist_del(&obj->node);
                kmem_cache_free(obj_cache, obj);
        }
+
+       raw_spin_lock_irqsave(&pool_lock, flags);
+       obj_pool_used -= percpu_pool->obj_free;
+       debug_objects_freed += percpu_pool->obj_free;
+       raw_spin_unlock_irqrestore(&pool_lock, flags);
+
        percpu_pool->obj_free = 0;
 
        return 0;
@@ -1321,6 +1328,8 @@ static int __init debug_objects_replace_static_objects(void)
                hlist_add_head(&obj->node, &objects);
        }
 
+       debug_objects_allocated += i;
+
        /*
         * debug_objects_mem_init() is now called early that only one CPU is up
         * and interrupts have been disabled, so it is safe to replace the
@@ -1389,6 +1398,7 @@ void __init debug_objects_mem_init(void)
                debug_objects_enabled = 0;
                kmem_cache_destroy(obj_cache);
                pr_warn("out of memory.\n");
+               return;
        } else
                debug_objects_selftest();