diff options
| author | Jens Axboe <axboe@fb.com> | 2017-04-20 17:37:05 +0200 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2017-04-20 17:39:12 +0200 |
| commit | 659b3394eb67a5e274d7e7348633b508510a5c8f (patch) | |
| tree | bf5c271fbf873d2605967986a4d6fe5e6e8468c9 /block | |
| parent | block, bfq: don't dereference bic before null checking it (diff) | |
| download | linux-659b3394eb67a5e274d7e7348633b508510a5c8f.tar.xz linux-659b3394eb67a5e274d7e7348633b508510a5c8f.zip | |
bfq: fix compile error if CONFIG_CGROUPS=n
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>
Diffstat (limited to 'block')
| -rw-r--r-- | block/bfq-iosched.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/block/bfq-iosched.h b/block/bfq-iosched.h index 4ce7915e8d84..ae783c06dfd9 100644 --- a/block/bfq-iosched.h +++ b/block/bfq-iosched.h @@ -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 |