Merge branch 'for-5.6-fixes' into for-5.7 (a09833f7) · Commits · 戴 / test

kernel/cgroup/cgroup-v1.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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);

+3 −3

Original line number	Diff line number	Diff line
		@@ -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);
		}