Merge branch 'for-5.6-fixes' into for-5.7

htejun · htejun · commit a09833f7cdf4 · 2020-03-12T16:44:18.000-04:00
diff --git a/kernel/cgroup/cgroup-v1.c b/kernel/cgroup/cgroup-v1.c
@@ -783,7 +783,7 @@ void cgroup1_release_agent(struct work_struct *work)
 
 	pathbuf = kmalloc(PATH_MAX, GFP_KERNEL);
 	agentbuf = kstrdup(cgrp->root->release_agent_path, GFP_KERNEL);
-	if (!pathbuf || !agentbuf)
+	if (!pathbuf || !agentbuf || !strlen(agentbuf))
 		goto out;
 
 	spin_lock_irq(&css_set_lock);
diff --git a/kernel/cgroup/cgroup.c b/kernel/cgroup/cgroup.c
@@ -3538,21 +3538,21 @@ static int cpu_stat_show(struct seq_file *seq, void *v)
 static int cgroup_io_pressure_show(struct seq_file *seq, void *v)
 {
 	struct cgroup *cgrp = seq_css(seq)->cgroup;
-	struct psi_group *psi = cgroup_id(cgrp) == 1 ? &psi_system : &cgrp->psi;
+	struct psi_group *psi = cgroup_ino(cgrp) == 1 ? &psi_system : &cgrp->psi;
 
 	return psi_show(seq, psi, PSI_IO);
 }
 static int cgroup_memory_pressure_show(struct seq_file *seq, void *v)
 {
 	struct cgroup *cgrp = seq_css(seq)->cgroup;
-	struct psi_group *psi = cgroup_id(cgrp) == 1 ? &psi_system : &cgrp->psi;
+	struct psi_group *psi = cgroup_ino(cgrp) == 1 ? &psi_system : &cgrp->psi;
 
 	return psi_show(seq, psi, PSI_MEM);
 }
 static int cgroup_cpu_pressure_show(struct seq_file *seq, void *v)
 {
 	struct cgroup *cgrp = seq_css(seq)->cgroup;
-	struct psi_group *psi = cgroup_id(cgrp) == 1 ? &psi_system : &cgrp->psi;
+	struct psi_group *psi = cgroup_ino(cgrp) == 1 ? &psi_system : &cgrp->psi;
 
 	return psi_show(seq, psi, PSI_CPU);
 }

Original file line number	Diff line number	Diff line change
`@@ -3538,21 +3538,21 @@ static int cpu_stat_show(struct seq_file seq, void v)`
`3538`	`3538`	`static int cgroup_io_pressure_show(struct seq_file seq, void v)`
`3539`	`3539`	`{`
`3540`	`3540`	`struct cgroup *cgrp = seq_css(seq)->cgroup;`
`3541`		`- struct psi_group *psi = cgroup_id(cgrp) == 1 ? &psi_system : &cgrp->psi;`
	`3541`	`+ struct psi_group *psi = cgroup_ino(cgrp) == 1 ? &psi_system : &cgrp->psi;`
`3542`	`3542`
`3543`	`3543`	`return psi_show(seq, psi, PSI_IO);`
`3544`	`3544`	`}`
`3545`	`3545`	`static int cgroup_memory_pressure_show(struct seq_file seq, void v)`
`3546`	`3546`	`{`
`3547`	`3547`	`struct cgroup *cgrp = seq_css(seq)->cgroup;`
`3548`		`- struct psi_group *psi = cgroup_id(cgrp) == 1 ? &psi_system : &cgrp->psi;`
	`3548`	`+ struct psi_group *psi = cgroup_ino(cgrp) == 1 ? &psi_system : &cgrp->psi;`
`3549`	`3549`
`3550`	`3550`	`return psi_show(seq, psi, PSI_MEM);`
`3551`	`3551`	`}`
`3552`	`3552`	`static int cgroup_cpu_pressure_show(struct seq_file seq, void v)`
`3553`	`3553`	`{`
`3554`	`3554`	`struct cgroup *cgrp = seq_css(seq)->cgroup;`
`3555`		`- struct psi_group *psi = cgroup_id(cgrp) == 1 ? &psi_system : &cgrp->psi;`
	`3555`	`+ struct psi_group *psi = cgroup_ino(cgrp) == 1 ? &psi_system : &cgrp->psi;`
`3556`	`3556`
`3557`	`3557`	`return psi_show(seq, psi, PSI_CPU);`
`3558`	`3558`	`}`