diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-06-10 07:43:30 -1000 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-06-10 07:43:30 -1000 |
| commit | 01ccc3ad44130458769646204449e2e4124f15da (patch) | |
| tree | da72d2b2acc7f8625ad1cd87bd65ba7050f702fe /include | |
| parent | 5e3b6b8ecc53ffec9472ce5468307061072a5ded (diff) | |
| parent | cf8929885de318c0bf73438c9e5dde59d6536f7c (diff) | |
| download | linux-01ccc3ad44130458769646204449e2e4124f15da.tar.bz2 | |
Merge tag 'for-linus-20190610' of git://git.kernel.dk/linux-block
Pull block cgroup symlink revert from Jens Axboe:
"I talked to Tejun about this offline, and he's not a huge fan of the
symlink.
So let's revert this for now, and Paolo can do this properly for 5.3
instead"
* tag 'for-linus-20190610' of git://git.kernel.dk/linux-block:
cgroup/bfq: revert bfq.weight symlink change
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/cgroup-defs.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/include/linux/cgroup-defs.h b/include/linux/cgroup-defs.h index d71b079bb021..11e215d7937e 100644 --- a/include/linux/cgroup-defs.h +++ b/include/linux/cgroup-defs.h @@ -106,8 +106,6 @@ enum { CFTYPE_WORLD_WRITABLE = (1 << 4), /* (DON'T USE FOR NEW FILES) S_IWUGO */ CFTYPE_DEBUG = (1 << 5), /* create when cgroup_debug */ - CFTYPE_SYMLINKED = (1 << 6), /* pointed to by symlink too */ - /* internal flags, do not use outside cgroup core proper */ __CFTYPE_ONLY_ON_DFL = (1 << 16), /* only on default hierarchy */ __CFTYPE_NOT_ON_DFL = (1 << 17), /* not on default hierarchy */ @@ -545,7 +543,6 @@ struct cftype { * end of cftype array. */ char name[MAX_CFTYPE_NAME]; - char link_name[MAX_CFTYPE_NAME]; unsigned long private; /* |