[Devel] [PATCH rh9 3/4] ve/proc: Rename proc_net_create_*() helpers

Konstantin Khorenko khorenko at virtuozzo.com
Thu Aug 11 14:40:46 MSK 2022


To_merge: ab9298751c69 ("ve/proc: restricted proc-entries scope")

Signed-off-by: Konstantin Khorenko <khorenko at virtuozzo.com>
---
 fs/locks.c             | 2 +-
 fs/proc/cmdline.c      | 2 +-
 fs/proc/devices.c      | 2 +-
 fs/proc/loadavg.c      | 2 +-
 fs/proc/meminfo.c      | 2 +-
 fs/proc/uptime.c       | 2 +-
 fs/proc/version.c      | 2 +-
 kernel/cgroup/cgroup.c | 2 +-
 mm/vmstat.c            | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/fs/locks.c b/fs/locks.c
index 2d886d86133d..24be2045c56f 100644
--- a/fs/locks.c
+++ b/fs/locks.c
@@ -2820,7 +2820,7 @@ static const struct seq_operations locks_seq_operations = {
 
 static int __init proc_locks_init(void)
 {
-	proc_net_create_seq_private("locks", 0, NULL, &locks_seq_operations,
+	proc_ve_create_seq_private("locks", 0, NULL, &locks_seq_operations,
 			sizeof(struct locks_iterator), NULL);
 	return 0;
 }
diff --git a/fs/proc/cmdline.c b/fs/proc/cmdline.c
index 607cc42865f6..122169dcafbd 100644
--- a/fs/proc/cmdline.c
+++ b/fs/proc/cmdline.c
@@ -16,7 +16,7 @@ static int cmdline_proc_show(struct seq_file *m, void *v)
 
 static int __init proc_cmdline_init(void)
 {
-	proc_net_create_single("cmdline", 0, NULL, cmdline_proc_show);
+	proc_ve_create_single("cmdline", 0, NULL, cmdline_proc_show);
 	return 0;
 }
 fs_initcall(proc_cmdline_init);
diff --git a/fs/proc/devices.c b/fs/proc/devices.c
index 7b8efb3d94d7..af0e9dfb224d 100644
--- a/fs/proc/devices.c
+++ b/fs/proc/devices.c
@@ -54,7 +54,7 @@ static const struct seq_operations devinfo_ops = {
 
 static int __init proc_devices_init(void)
 {
-	proc_net_create_seq("devices", 0, NULL, &devinfo_ops);
+	proc_ve_create_seq("devices", 0, NULL, &devinfo_ops);
 	return 0;
 }
 fs_initcall(proc_devices_init);
diff --git a/fs/proc/loadavg.c b/fs/proc/loadavg.c
index 32148d6f66ef..ee4d97ef5771 100644
--- a/fs/proc/loadavg.c
+++ b/fs/proc/loadavg.c
@@ -37,7 +37,7 @@ static int loadavg_proc_show(struct seq_file *m, void *v)
 
 static int __init proc_loadavg_init(void)
 {
-	proc_net_create_single("loadavg", 0, NULL, loadavg_proc_show);
+	proc_ve_create_single("loadavg", 0, NULL, loadavg_proc_show);
 	return 0;
 }
 fs_initcall(proc_loadavg_init);
diff --git a/fs/proc/meminfo.c b/fs/proc/meminfo.c
index 7758c56b65d1..268af1c87bd2 100644
--- a/fs/proc/meminfo.c
+++ b/fs/proc/meminfo.c
@@ -273,7 +273,7 @@ static int meminfo_proc_show(struct seq_file *m, void *v)
 
 static int __init proc_meminfo_init(void)
 {
-	proc_net_create_single("meminfo", 0, NULL, meminfo_proc_show);
+	proc_ve_create_single("meminfo", 0, NULL, meminfo_proc_show);
 	return 0;
 }
 fs_initcall(proc_meminfo_init);
diff --git a/fs/proc/uptime.c b/fs/proc/uptime.c
index 7c9b71824fee..67f2f7b69722 100644
--- a/fs/proc/uptime.c
+++ b/fs/proc/uptime.c
@@ -59,7 +59,7 @@ static int uptime_proc_show(struct seq_file *m, void *v)
 
 static int __init proc_uptime_init(void)
 {
-	proc_net_create_single("uptime", 0, NULL, uptime_proc_show);
+	proc_ve_create_single("uptime", 0, NULL, uptime_proc_show);
 	return 0;
 }
 fs_initcall(proc_uptime_init);
diff --git a/fs/proc/version.c b/fs/proc/version.c
index 233801792fe8..4d546d9ea621 100644
--- a/fs/proc/version.c
+++ b/fs/proc/version.c
@@ -17,7 +17,7 @@ static int version_proc_show(struct seq_file *m, void *v)
 
 static int __init proc_version_init(void)
 {
-	proc_net_create_single("version", 0, NULL, version_proc_show);
+	proc_ve_create_single("version", 0, NULL, version_proc_show);
 	return 0;
 }
 fs_initcall(proc_version_init);
diff --git a/kernel/cgroup/cgroup.c b/kernel/cgroup/cgroup.c
index 30f10afaecd4..ac66df6bfd59 100644
--- a/kernel/cgroup/cgroup.c
+++ b/kernel/cgroup/cgroup.c
@@ -6272,7 +6272,7 @@ int __init cgroup_init(void)
 	WARN_ON(sysfs_create_mount_point(fs_kobj, "cgroup"));
 	WARN_ON(register_filesystem(&cgroup_fs_type));
 	WARN_ON(register_filesystem(&cgroup2_fs_type));
-	WARN_ON(!proc_net_create_single("cgroups", 0, NULL,
+	WARN_ON(!proc_ve_create_single("cgroups", 0, NULL,
 					proc_cgroupstats_show));
 #ifdef CONFIG_CPUSETS
 	WARN_ON(register_filesystem(&cpuset_fs_type));
diff --git a/mm/vmstat.c b/mm/vmstat.c
index 4889fe00be57..798b4d44b966 100644
--- a/mm/vmstat.c
+++ b/mm/vmstat.c
@@ -2105,7 +2105,7 @@ void __init init_mm_internals(void)
 #ifdef CONFIG_PROC_FS
 	proc_create_seq("buddyinfo", 0444, NULL, &fragmentation_op);
 	proc_create_seq("pagetypeinfo", 0400, NULL, &pagetypeinfo_op);
-	proc_net_create_seq("vmstat", 0444, NULL, &vmstat_op);
+	proc_ve_create_seq("vmstat", 0444, NULL, &vmstat_op);
 	proc_create_seq("zoneinfo", 0444, NULL, &zoneinfo_op);
 #endif
 }
-- 
2.31.1



More information about the Devel mailing list