UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

rue/io: fix blkcg_dkstats_show_comm implicit declaration error 

Upstream: no

Fix compile error msg of "error: implicit declaration of function
‘blkcg_dkstats_show_comm’" when CONFIG_CGROUPFS enabled and
CONFIG_BLK_CGROUP_DISKSTATS disabled.

Co-developed-by: Like Xu <likexu@tencent.com>
Signed-off-by: Like Xu <likexu@tencent.com>
Signed-off-by: Haisu Wang <haisuwang@tencent.com>
Reviewed-by: Kairui Song <kasong@tencent.com>
This commit is contained in:
Haisu Wang 2024-04-12 11:10:35 +08:00
parent 174d3267d3
commit 9b585b2f68
3 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
block/blk-cgroup.c
View File

@ -999,7 +999,7 @@ static int blkcg_reset_stats(struct cgroup_subsys_state *css,
return 0;
}
#ifdef CONFIG_CGROUPFS
#if defined(CONFIG_CGROUPFS) && defined(CONFIG_BLK_CGROUP_DISKSTATS)
int blkcg_cgroupfs_dkstats_show(struct seq_file *m, void *v)
{
int ret;

2
fs/cgroupfs/mount.c
View File

@ -477,7 +477,9 @@ static int cgroupfs_fill_super(struct super_block *sb, void *data, int silent)
cgroupfs_new_entry(sb, "stat", proc, CGROUPFS_TYPE_STAT, f_mode);
cgroupfs_new_entry(sb, "uptime", proc, CGROUPFS_TYPE_UPTIME, f_mode);
cgroupfs_new_entry(sb, "loadavg", proc, CGROUPFS_TYPE_LOADAVG, f_mode);
#ifdef CONFIG_BLK_CGROUP_DISKSTATS
cgroupfs_new_entry(sb, "diskstats", proc, CGROUPFS_TYPE_DKSTATS, f_mode);
#endif
cgroupfs_new_entry(sb, "vmstat", proc, CGROUPFS_TYPE_VMSTAT, f_mode);
entry = cgroupfs_new_entry(sb, "devices", sys, CGROUPFS_TYPE_NORMAL_DIR, d_mode);

4
fs/cgroupfs/proc.c
View File

@ -15,7 +15,9 @@ extern int cpuset_cgroupfs_stat_show(struct seq_file *m, void *v);
extern int mem_cgroupfs_meminfo_show(struct seq_file *m, void *v);
extern int cpuacct_cgroupfs_uptime_show(struct seq_file *m, void *v);
extern int cpuset_cgroupfs_loadavg_show(struct seq_file *m, void *v);
#ifdef CONFIG_BLK_CGROUP_DISKSTATS
extern int blkcg_cgroupfs_dkstats_show(struct seq_file *m, void *v);
#endif
extern int mem_cgroupfs_vmstat_show(struct seq_file *m, void *v);
extern int cpu_get_max_cpus(struct task_struct *p);
extern int cpuset_cgroupfs_get_cpu_count(void);
@ -50,8 +52,10 @@ static int cgroup_fs_show(struct seq_file *m, void *v)
return cpuacct_cgroupfs_uptime_show(m, v);
case CGROUPFS_TYPE_LOADAVG:
return cpuset_cgroupfs_loadavg_show(m, v);
#ifdef CONFIG_BLK_CGROUP_DISKSTATS
case CGROUPFS_TYPE_DKSTATS:
return blkcg_cgroupfs_dkstats_show(m, v);
#endif
case CGROUPFS_TYPE_VMSTAT:
return mem_cgroupfs_vmstat_show(m, v);
case CGROUPFS_TYPE_CPU_ONLINE: