aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTejun Heo <tj@kernel.org>2010-07-20 16:09:01 -0400
committerTejun Heo <tj@kernel.org>2010-07-22 16:58:58 -0400
commitd098adfb7d281258173a43151483e52e21761021 (patch)
tree29a28d972770cdcd6b316d4ab43a5829f4fbe795
parent8af7c12436803291c90295259db23d371a7ad9cc (diff)
fscache: drop references to slow-work
fscache no longer uses slow-work. Drop references to it. Signed-off-by: Tejun Heo <tj@kernel.org> Acked-by: David Howells <dhowells@redhat.com>
-rw-r--r--fs/fscache/Kconfig1
-rw-r--r--fs/fscache/main.c7
-rw-r--r--include/linux/fscache-cache.h1
3 files changed, 0 insertions, 9 deletions
diff --git a/fs/fscache/Kconfig b/fs/fscache/Kconfig
index cc94bb9563f2..3f6dfa989881 100644
--- a/fs/fscache/Kconfig
+++ b/fs/fscache/Kconfig
@@ -1,7 +1,6 @@
1 1
2config FSCACHE 2config FSCACHE
3 tristate "General filesystem local caching manager" 3 tristate "General filesystem local caching manager"
4 select SLOW_WORK
5 help 4 help
6 This option enables a generic filesystem caching manager that can be 5 This option enables a generic filesystem caching manager that can be
7 used by various network and other filesystems to cache data locally. 6 used by various network and other filesystems to cache data locally.
diff --git a/fs/fscache/main.c b/fs/fscache/main.c
index 44d13ddab2cc..500936d9fff2 100644
--- a/fs/fscache/main.c
+++ b/fs/fscache/main.c
@@ -106,10 +106,6 @@ static int __init fscache_init(void)
106 unsigned int cpu; 106 unsigned int cpu;
107 int ret; 107 int ret;
108 108
109 ret = slow_work_register_user(THIS_MODULE);
110 if (ret < 0)
111 goto error_slow_work;
112
113 fscache_object_max_active = 109 fscache_object_max_active =
114 clamp_val(nr_cpus, 110 clamp_val(nr_cpus,
115 fscache_object_max_active, WQ_UNBOUND_MAX_ACTIVE); 111 fscache_object_max_active, WQ_UNBOUND_MAX_ACTIVE);
@@ -176,8 +172,6 @@ error_proc:
176error_op_wq: 172error_op_wq:
177 destroy_workqueue(fscache_object_wq); 173 destroy_workqueue(fscache_object_wq);
178error_object_wq: 174error_object_wq:
179 slow_work_unregister_user(THIS_MODULE);
180error_slow_work:
181 return ret; 175 return ret;
182} 176}
183 177
@@ -196,7 +190,6 @@ static void __exit fscache_exit(void)
196 fscache_proc_cleanup(); 190 fscache_proc_cleanup();
197 destroy_workqueue(fscache_op_wq); 191 destroy_workqueue(fscache_op_wq);
198 destroy_workqueue(fscache_object_wq); 192 destroy_workqueue(fscache_object_wq);
199 slow_work_unregister_user(THIS_MODULE);
200 printk(KERN_NOTICE "FS-Cache: Unloaded\n"); 193 printk(KERN_NOTICE "FS-Cache: Unloaded\n");
201} 194}
202 195
diff --git a/include/linux/fscache-cache.h b/include/linux/fscache-cache.h
index 17ed9c1dbfbe..b8581c09d19f 100644
--- a/include/linux/fscache-cache.h
+++ b/include/linux/fscache-cache.h
@@ -20,7 +20,6 @@
20 20
21#include <linux/fscache.h> 21#include <linux/fscache.h>
22#include <linux/sched.h> 22#include <linux/sched.h>
23#include <linux/slow-work.h>
24#include <linux/workqueue.h> 23#include <linux/workqueue.h>
25 24
26#define NR_MAXCACHES BITS_PER_LONG 25#define NR_MAXCACHES BITS_PER_LONG