Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0b508bc9 authored by Shaohua Li's avatar Shaohua Li Committed by Jens Axboe
Browse files

block: fix a build error 



The code is only for blkcg not for all cgroups

Fixes: d4478e92 ("block/loop: make loop cgroup aware")
Reported-by: default avatarkbuild test robot <fengguang.wu@intel.com>
Signed-off-by: default avatarShaohua Li <shli@fb.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 9979d545

drivers/block/loop.c

+1 −1
Original line number Diff line number Diff line
@@ -1692,7 +1692,7 @@ static blk_status_t loop_queue_rq(struct blk_mq_hw_ctx *hctx, 
	}



	/* 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) {

		cmd->css = cmd->rq->bio->bi_css;

		css_get(cmd->css);

include/linux/kthread.h

+1 −1
Original line number Diff line number Diff line
@@ -199,7 +199,7 @@ bool kthread_cancel_delayed_work_sync(struct kthread_delayed_work *work); 


void kthread_destroy_worker(struct kthread_worker *worker);



#ifdef CONFIG_CGROUPS

#ifdef CONFIG_BLK_CGROUP

void kthread_associate_blkcg(struct cgroup_subsys_state *css);

struct cgroup_subsys_state *kthread_blkcg(void);

#else

kernel/kthread.c

+4 −4
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ struct kthread { 
	void *data;

	struct completion parked;

	struct completion exited;

#ifdef CONFIG_CGROUPS

#ifdef CONFIG_BLK_CGROUP

	struct cgroup_subsys_state *blkcg_css;

#endif

};
@@ -83,7 +83,7 @@ void free_kthread_struct(struct task_struct *k) 
	 * or if kmalloc() in kthread() failed.

	 */

	kthread = to_kthread(k);

#ifdef CONFIG_CGROUPS

#ifdef CONFIG_BLK_CGROUP

	WARN_ON_ONCE(kthread && kthread->blkcg_css);

#endif

	kfree(kthread);
@@ -224,7 +224,7 @@ static int kthread(void *_create) 
	self->data = data;

	init_completion(&self->exited);

	init_completion(&self->parked);

#ifdef CONFIG_CGROUPS

#ifdef CONFIG_BLK_CGROUP

	self->blkcg_css = NULL;

#endif

	current->vfork_done = &self->exited;
@@ -1166,7 +1166,7 @@ void kthread_destroy_worker(struct kthread_worker *worker) 
}

EXPORT_SYMBOL(kthread_destroy_worker);



#ifdef CONFIG_CGROUPS

#ifdef CONFIG_BLK_CGROUP

/**

 * kthread_associate_blkcg - associate blkcg to current kthread

 * @css: the cgroup info