bfq: fix compile error if CONFIG_CGROUPS=n (659b3394) · Commits · 戴 / test

If we don't have CGROUPS enabled, the compile ends in the following misery: In file included from ../block/bfq-iosched.c:105:0: ../block/bfq-iosched.h:819:22: error: array type has incomplete element type extern struct cftype bfq_blkcg_legacy_files[]; ^ ../block/bfq-iosched.h:820:22: error: array type has incomplete element type extern struct cftype bfq_blkg_files[]; ^ Move the declarations under the right ifdef. Reported-by:

Randy Dunlap <rdunlap@infradead.org> Signed-off-by:

Jens Axboe <axboe@fb.com>

block/bfq-iosched.h

+2 −3

Original line number	Diff line number	Diff line
		@@ -816,9 +816,6 @@ void bfq_put_async_queues(struct bfq_data bfqd, struct bfq_group bfqg);

		/* ---------------- cgroups-support interface ---------------- */

		extern struct cftype bfq_blkcg_legacy_files[];
		extern struct cftype bfq_blkg_files[];

		void bfqg_stats_update_io_add(struct bfq_group bfqg, struct bfq_queue bfqq,
		unsigned int op);
		void bfqg_stats_update_io_remove(struct bfq_group *bfqg, unsigned int op);
		@@ -844,6 +841,8 @@ struct bfq_group bfq_create_group_hierarchy(struct bfq_data bfqd, int node);
		void bfqg_put(struct bfq_group *bfqg);

		#ifdef CONFIG_BFQ_GROUP_IOSCHED
		extern struct cftype bfq_blkcg_legacy_files[];
		extern struct cftype bfq_blkg_files[];
		extern struct blkcg_policy blkcg_policy_bfq;
		#endif

Admin message