diff options
author | David Howells <dhowells@redhat.com> | 2018-06-13 20:43:19 +0200 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2018-06-15 06:48:57 +0200 |
commit | 24074a35c5c975c94cd9691ae962855333aac47f (patch) | |
tree | 1b59ef017c85f158edf696564fe441fa2356ca3e /fs/proc/root.c | |
parent | Merge tag 'afs-fixes-20180514' into afs-proc (diff) | |
download | linux-24074a35c5c975c94cd9691ae962855333aac47f.tar.xz linux-24074a35c5c975c94cd9691ae962855333aac47f.zip |
proc: Make inline name size calculation automatic
Make calculation of the size of the inline name in struct proc_dir_entry
automatic, rather than having to manually encode the numbers and failing to
allow for lockdep.
Require a minimum inline name size of 33+1 to allow for names that look
like two hex numbers with a dash between.
Reported-by: Al Viro <viro@ZenIV.linux.org.uk>
Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to '')
-rw-r--r-- | fs/proc/root.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/proc/root.c b/fs/proc/root.c index 61b7340b357a..f4b1a9d2eca6 100644 --- a/fs/proc/root.c +++ b/fs/proc/root.c @@ -204,8 +204,7 @@ struct proc_dir_entry proc_root = { .proc_fops = &proc_root_operations, .parent = &proc_root, .subdir = RB_ROOT, - .name = proc_root.inline_name, - .inline_name = "/proc", + .name = "/proc", }; int pid_ns_prepare_proc(struct pid_namespace *ns) |