[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[PATCH v3 17/49] quota: dynamically allocate the dquota-cache shrinker



Use new APIs to dynamically allocate the dquota-cache shrinker.

Signed-off-by: Qi Zheng <zhengqi.arch@xxxxxxxxxxxxx>
Reviewed-by: Muchun Song <songmuchun@xxxxxxxxxxxxx>
---
 fs/quota/dquot.c | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/fs/quota/dquot.c b/fs/quota/dquot.c
index e8232242dd34..8883e6992f7c 100644
--- a/fs/quota/dquot.c
+++ b/fs/quota/dquot.c
@@ -791,12 +791,6 @@ dqcache_shrink_count(struct shrinker *shrink, struct 
shrink_control *sc)
        percpu_counter_read_positive(&dqstats.counter[DQST_FREE_DQUOTS]));
 }
 
-static struct shrinker dqcache_shrinker = {
-       .count_objects = dqcache_shrink_count,
-       .scan_objects = dqcache_shrink_scan,
-       .seeks = DEFAULT_SEEKS,
-};
-
 /*
  * Safely release dquot and put reference to dquot.
  */
@@ -2957,6 +2951,7 @@ static int __init dquot_init(void)
 {
        int i, ret;
        unsigned long nr_hash, order;
+       struct shrinker *dqcache_shrinker;
 
        printk(KERN_NOTICE "VFS: Disk quotas %s\n", __DQUOT_VERSION__);
 
@@ -2991,8 +2986,15 @@ static int __init dquot_init(void)
        pr_info("VFS: Dquot-cache hash table entries: %ld (order %ld,"
                " %ld bytes)\n", nr_hash, order, (PAGE_SIZE << order));
 
-       if (register_shrinker(&dqcache_shrinker, "dquota-cache"))
-               panic("Cannot register dquot shrinker");
+       dqcache_shrinker = shrinker_alloc(0, "dquota-cache");
+       if (!dqcache_shrinker)
+               panic("Cannot allocate dquot shrinker");
+
+       dqcache_shrinker->count_objects = dqcache_shrink_count;
+       dqcache_shrinker->scan_objects = dqcache_shrink_scan;
+       dqcache_shrinker->seeks = DEFAULT_SEEKS;
+
+       shrinker_register(dqcache_shrinker);
 
        return 0;
 }
-- 
2.30.2




 


Rackspace

Lists.xenproject.org is hosted with RackSpace, monitoring our
servers 24x7x365 and backed by RackSpace's Fanatical Support®.