diff options
| author | Jens Axboe <axboe@kernel.dk> | 2019-06-10 11:35:41 +0200 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2019-06-10 11:35:41 +0200 |
| commit | cf8929885de318c0bf73438c9e5dde59d6536f7c (patch) | |
| tree | 70e8a22308b033b9b2200d263cda09fddab6d394 /block | |
| parent | Linux 5.2-rc4 (diff) | |
| download | linux-cf8929885de318c0bf73438c9e5dde59d6536f7c.tar.xz linux-cf8929885de318c0bf73438c9e5dde59d6536f7c.zip | |
cgroup/bfq: revert bfq.weight symlink change
There's some discussion on how to do this the best, and Tejun prefers
that BFQ just create the file itself instead of having cgroups support
a symlink feature.
Hence revert commit 54b7b868e826 and 19e9da9e86c4 for 5.2, and this
can be done properly for 5.3.
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'block')
| -rw-r--r-- | block/bfq-cgroup.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/block/bfq-cgroup.c b/block/bfq-cgroup.c index 59f46904cb11..b3796a40a61a 100644 --- a/block/bfq-cgroup.c +++ b/block/bfq-cgroup.c @@ -1046,8 +1046,7 @@ struct blkcg_policy blkcg_policy_bfq = { struct cftype bfq_blkcg_legacy_files[] = { { .name = "bfq.weight", - .link_name = "weight", - .flags = CFTYPE_NOT_ON_ROOT | CFTYPE_SYMLINKED, + .flags = CFTYPE_NOT_ON_ROOT, .seq_show = bfq_io_show_weight, .write_u64 = bfq_io_set_weight_legacy, }, @@ -1167,8 +1166,7 @@ struct cftype bfq_blkcg_legacy_files[] = { struct cftype bfq_blkg_files[] = { { .name = "bfq.weight", - .link_name = "weight", - .flags = CFTYPE_NOT_ON_ROOT | CFTYPE_SYMLINKED, + .flags = CFTYPE_NOT_ON_ROOT, .seq_show = bfq_io_show_weight, .write = bfq_io_set_weight, }, |