android/android_kernel_samsung_sm8650
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

block: fix a build error

Browse Source 
The code is only for blkcg not for all cgroups

Fixes: d4478e92d6 ("block/loop: make loop cgroup aware")
Reported-by: kbuild test robot <fengguang.wu@intel.com>
Signed-off-by: Shaohua Li <shli@fb.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Shaohua Li 2017-09-26 11:02:12 -07:00 committed by Jens Axboe
parent 9979d545c9
commit 0b508bc926
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/block/loop.c
View File

@ -1692,7 +1692,7 @@ static blk_status_t loop_queue_rq(struct blk_mq_hw_ctx *hctx,
} }
/* always use the first bio's css */ /* always use the first bio's css */
#ifdef CONFIG_CGROUPS #ifdef CONFIG_BLK_CGROUP
if (cmd->use_aio && cmd->rq->bio && cmd->rq->bio->bi_css) { if (cmd->use_aio && cmd->rq->bio && cmd->rq->bio->bi_css) {
cmd->css = cmd->rq->bio->bi_css; cmd->css = cmd->rq->bio->bi_css;
css_get(cmd->css); css_get(cmd->css);

2
include/linux/kthread.h
View File

@ -199,7 +199,7 @@ bool kthread_cancel_delayed_work_sync(struct kthread_delayed_work *work);
void kthread_destroy_worker(struct kthread_worker *worker); void kthread_destroy_worker(struct kthread_worker *worker);
#ifdef CONFIG_CGROUPS #ifdef CONFIG_BLK_CGROUP
void kthread_associate_blkcg(struct cgroup_subsys_state *css); void kthread_associate_blkcg(struct cgroup_subsys_state *css);
struct cgroup_subsys_state *kthread_blkcg(void); struct cgroup_subsys_state *kthread_blkcg(void);
#else #else

8
kernel/kthread.c
View File

@ -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