|
@@ -46,7 +46,7 @@ struct kthread {
|
|
void *data;
|
|
void *data;
|
|
struct completion parked;
|
|
struct completion parked;
|
|
struct completion exited;
|
|
struct completion exited;
|
|
-#ifdef CONFIG_CGROUPS
|
|
|
|
|
|
+#ifdef CONFIG_BLK_CGROUP
|
|
struct cgroup_subsys_state *blkcg_css;
|
|
struct cgroup_subsys_state *blkcg_css;
|
|
#endif
|
|
#endif
|
|
};
|
|
};
|
|
@@ -83,7 +83,7 @@ void free_kthread_struct(struct task_struct *k)
|
|
* or if kmalloc() in kthread() failed.
|
|
* or if kmalloc() in kthread() failed.
|
|
*/
|
|
*/
|
|
kthread = to_kthread(k);
|
|
kthread = to_kthread(k);
|
|
-#ifdef CONFIG_CGROUPS
|
|
|
|
|
|
+#ifdef CONFIG_BLK_CGROUP
|
|
WARN_ON_ONCE(kthread && kthread->blkcg_css);
|
|
WARN_ON_ONCE(kthread && kthread->blkcg_css);
|
|
#endif
|
|
#endif
|
|
kfree(kthread);
|
|
kfree(kthread);
|
|
@@ -224,7 +224,7 @@ static int kthread(void *_create)
|
|
self->data = data;
|
|
self->data = data;
|
|
init_completion(&self->exited);
|
|
init_completion(&self->exited);
|
|
init_completion(&self->parked);
|
|
init_completion(&self->parked);
|
|
-#ifdef CONFIG_CGROUPS
|
|
|
|
|
|
+#ifdef CONFIG_BLK_CGROUP
|
|
self->blkcg_css = NULL;
|
|
self->blkcg_css = NULL;
|
|
#endif
|
|
#endif
|
|
current->vfork_done = &self->exited;
|
|
current->vfork_done = &self->exited;
|
|
@@ -1166,7 +1166,7 @@ void kthread_destroy_worker(struct kthread_worker *worker)
|
|
}
|
|
}
|
|
EXPORT_SYMBOL(kthread_destroy_worker);
|
|
EXPORT_SYMBOL(kthread_destroy_worker);
|
|
|
|
|
|
-#ifdef CONFIG_CGROUPS
|
|
|
|
|
|
+#ifdef CONFIG_BLK_CGROUP
|
|
/**
|
|
/**
|
|
* kthread_associate_blkcg - associate blkcg to current kthread
|
|
* kthread_associate_blkcg - associate blkcg to current kthread
|
|
* @css: the cgroup info
|
|
* @css: the cgroup info
|