staging: erofs: staticize erofs_shrink_count, erofs_shrink_scan

Move erofs_shrinker_info to utils.c and therefore
no need to globalize erofs_shrink_count and erofs_shrink_scan.

Signed-off-by: Gao Xiang <gaoxiang25@huawei.com>
Reviewed-by: Chao Yu <yuchao0@huawei.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/erofs/internal.h b/drivers/staging/erofs/internal.h
index 967ec1a567268bd82ffc50f6948e13a4589d8a58..304c79d253ae6be979536f71ca4f2c5db11c02ac 100644 (file)
--- a/drivers/staging/erofs/internal.h
+++ b/drivers/staging/erofs/internal.h
@@ -589,10 +589,7 @@ extern struct page *erofs_allocpage(struct list_head *pool, gfp_t gfp);
 extern void erofs_register_super(struct super_block *sb);
 extern void erofs_unregister_super(struct super_block *sb);
 
-extern unsigned long erofs_shrink_count(struct shrinker *shrink,
-       struct shrink_control *sc);
-extern unsigned long erofs_shrink_scan(struct shrinker *shrink,
-       struct shrink_control *sc);
+extern struct shrinker erofs_shrinker_info;
 
 #ifndef lru_to_page
 #define lru_to_page(head) (list_entry((head)->prev, struct page, lru))

diff --git a/drivers/staging/erofs/super.c b/drivers/staging/erofs/super.c
index 69e1840d3842f2814f4346ff2f47288716b8d690..af5140eede18aa0f4ab30f67995f79b809fde2eb 100644 (file)
--- a/drivers/staging/erofs/super.c
+++ b/drivers/staging/erofs/super.c
@@ -539,12 +539,6 @@ static void erofs_kill_sb(struct super_block *sb)
        kill_block_super(sb);
 }
 
-static struct shrinker erofs_shrinker_info = {
-       .scan_objects = erofs_shrink_scan,
-       .count_objects = erofs_shrink_count,
-       .seeks = DEFAULT_SEEKS,
-};
-
 static struct file_system_type erofs_fs_type = {
        .owner          = THIS_MODULE,
        .name           = "erofs",

diff --git a/drivers/staging/erofs/utils.c b/drivers/staging/erofs/utils.c
index 5695efaeb43abe419c8762657bc2be747f7cb72f..5f61f99f4c10fcc58a7154e182994a0a1d70da22 100644 (file)
--- a/drivers/staging/erofs/utils.c
+++ b/drivers/staging/erofs/utils.c
@@ -270,14 +270,14 @@ void erofs_unregister_super(struct super_block *sb)
        spin_unlock(&erofs_sb_list_lock);
 }
 
-unsigned long erofs_shrink_count(struct shrinker *shrink,
-                                struct shrink_control *sc)
+static unsigned long erofs_shrink_count(struct shrinker *shrink,
+                                       struct shrink_control *sc)
 {
        return atomic_long_read(&erofs_global_shrink_cnt);
 }
 
-unsigned long erofs_shrink_scan(struct shrinker *shrink,
-                               struct shrink_control *sc)
+static unsigned long erofs_shrink_scan(struct shrinker *shrink,
+                                      struct shrink_control *sc)
 {
        struct erofs_sb_info *sbi;
        struct list_head *p;
@@ -333,3 +333,9 @@ unsigned long erofs_shrink_scan(struct shrinker *shrink,
        return freed;
 }
 
+struct shrinker erofs_shrinker_info = {
+       .scan_objects = erofs_shrink_scan,
+       .count_objects = erofs_shrink_count,
+       .seeks = DEFAULT_SEEKS,
+};
+