diff options
| author | Scott Wood <scottwood@freescale.com> | 2014-04-07 23:49:35 (GMT) |
|---|---|---|
| committer | Scott Wood <scottwood@freescale.com> | 2014-04-07 23:49:35 (GMT) |
| commit | 62b8c978ee6b8d135d9e7953221de58000dba986 (patch) | |
| tree | 683b04b2e627f6710c22c151b23c8cc9a165315e /fs/gfs2/main.c | |
| parent | 78fd82238d0e5716578c326404184a27ba67fd6e (diff) | |
| download | linux-fsl-qoriq-62b8c978ee6b8d135d9e7953221de58000dba986.tar.xz | |
Rewind v3.13-rc3+ (78fd82238d0e5716) to v3.12
Diffstat (limited to 'fs/gfs2/main.c')
| -rw-r--r-- | fs/gfs2/main.c | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/fs/gfs2/main.c b/fs/gfs2/main.c index 0650db2..351586e 100644 --- a/fs/gfs2/main.c +++ b/fs/gfs2/main.c @@ -31,6 +31,12 @@ struct workqueue_struct *gfs2_control_wq; +static struct shrinker qd_shrinker = { + .count_objects = gfs2_qd_shrink_count, + .scan_objects = gfs2_qd_shrink_scan, + .seeks = DEFAULT_SEEKS, +}; + static void gfs2_init_inode_once(void *foo) { struct gfs2_inode *ip = foo; @@ -81,10 +87,6 @@ static int __init init_gfs2_fs(void) if (error) return error; - error = list_lru_init(&gfs2_qd_lru); - if (error) - goto fail_lru; - error = gfs2_glock_init(); if (error) goto fail; @@ -137,7 +139,7 @@ static int __init init_gfs2_fs(void) if (!gfs2_rsrv_cachep) goto fail; - register_shrinker(&gfs2_qd_shrinker); + register_shrinker(&qd_shrinker); error = register_filesystem(&gfs2_fs_type); if (error) @@ -177,9 +179,7 @@ fail_wq: fail_unregister: unregister_filesystem(&gfs2_fs_type); fail: - list_lru_destroy(&gfs2_qd_lru); -fail_lru: - unregister_shrinker(&gfs2_qd_shrinker); + unregister_shrinker(&qd_shrinker); gfs2_glock_exit(); if (gfs2_rsrv_cachep) @@ -214,14 +214,13 @@ fail_lru: static void __exit exit_gfs2_fs(void) { - unregister_shrinker(&gfs2_qd_shrinker); + unregister_shrinker(&qd_shrinker); gfs2_glock_exit(); gfs2_unregister_debugfs(); unregister_filesystem(&gfs2_fs_type); unregister_filesystem(&gfs2meta_fs_type); destroy_workqueue(gfs_recovery_wq); destroy_workqueue(gfs2_control_wq); - list_lru_destroy(&gfs2_qd_lru); rcu_barrier(); |