diff options
| author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2022-02-17 18:40:54 -0300 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2022-02-17 18:40:54 -0300 |
| commit | 859f7e45542aecaa77fde929232cbcf91b29e11d (patch) | |
| tree | 5e81bbb0145bf2467e85ee8106734b4130f52ec0 /fs/file_table.c | |
| parent | 052747700e914896e8c78ff019411487dc7c12a0 (diff) | |
| parent | b3d971ec25346d6890e9e8f05b63f758cfcef8c5 (diff) | |
Merge remote-tracking branch 'torvalds/master' into perf/core
To pick up fixes from perf/urgent that recently got merged.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'fs/file_table.c')
| -rw-r--r-- | fs/file_table.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/fs/file_table.c b/fs/file_table.c index 4969021fa6764..7d2e692b66a94 100644 --- a/fs/file_table.c +++ b/fs/file_table.c @@ -27,6 +27,7 @@ #include <linux/task_work.h> #include <linux/ima.h> #include <linux/swap.h> +#include <linux/kmemleak.h> #include <linux/atomic.h> @@ -119,8 +120,11 @@ static struct ctl_table fs_stat_sysctls[] = { static int __init init_fs_stat_sysctls(void) { register_sysctl_init("fs", fs_stat_sysctls); - if (IS_ENABLED(CONFIG_BINFMT_MISC)) - register_sysctl_mount_point("fs/binfmt_misc"); + if (IS_ENABLED(CONFIG_BINFMT_MISC)) { + struct ctl_table_header *hdr; + hdr = register_sysctl_mount_point("fs/binfmt_misc"); + kmemleak_not_leak(hdr); + } return 0; } fs_initcall(init_fs_stat_sysctls); |