cgroup/cpuset: Remove cpuset_slab_spread_rotor

Since the SLAB implementation was removed in v6.8, so the
cpuset_slab_spread_rotor is no longer used and can be removed.

Signed-off-by: Xiu Jianfeng <xiujianfeng@huawei.com>
Reviewed-by: Waiman Long <longman@redhat.com>
Signed-off-by: Tejun Heo <tj@kernel.org>

diff --git a/include/linux/cpuset.h b/include/linux/cpuset.h
index de4cf0ee96f79eeae224e4433b905b1692c5fc6f..2a6981eeebf885858e463492622225a0474959c5 100644 (file)
--- a/include/linux/cpuset.h
+++ b/include/linux/cpuset.h
@@ -113,7 +113,6 @@ extern int proc_cpuset_show(struct seq_file *m, struct pid_namespace *ns,
                            struct pid *pid, struct task_struct *tsk);
 
 extern int cpuset_mem_spread_node(void);
-extern int cpuset_slab_spread_node(void);
 
 static inline int cpuset_do_page_mem_spread(void)
 {
@@ -246,11 +245,6 @@ static inline int cpuset_mem_spread_node(void)
        return 0;
 }
 
-static inline int cpuset_slab_spread_node(void)
-{
-       return 0;
-}
-
 static inline int cpuset_do_page_mem_spread(void)
 {
        return 0;

diff --git a/include/linux/sched.h b/include/linux/sched.h
index f8d150343d42d9b4549250454f62432888476acb..3773c1c8f099a0653c978801871ef024bddaaf08 100644 (file)
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -1243,7 +1243,6 @@ struct task_struct {
        /* Sequence number to catch updates: */
        seqcount_spinlock_t             mems_allowed_seq;
        int                             cpuset_mem_spread_rotor;
-       int                             cpuset_slab_spread_rotor;
 #endif
 #ifdef CONFIG_CGROUPS
        /* Control Group info protected by css_set_lock: */

diff --git a/kernel/cgroup/cpuset.c b/kernel/cgroup/cpuset.c
index 918268bc03a726a5146b0ba8c3ed9bc114ef71d7..9f9e626dabb0309958e210b5b598a24e812dadde 100644 (file)
--- a/kernel/cgroup/cpuset.c
+++ b/kernel/cgroup/cpuset.c
@@ -5012,19 +5012,6 @@ int cpuset_mem_spread_node(void)
        return cpuset_spread_node(&current->cpuset_mem_spread_rotor);
 }
 
-/**
- * cpuset_slab_spread_node() - On which node to begin search for a slab page
- */
-int cpuset_slab_spread_node(void)
-{
-       if (current->cpuset_slab_spread_rotor == NUMA_NO_NODE)
-               current->cpuset_slab_spread_rotor =
-                       node_random(&current->mems_allowed);
-
-       return cpuset_spread_node(&current->cpuset_slab_spread_rotor);
-}
-EXPORT_SYMBOL_GPL(cpuset_mem_spread_node);
-
 /**
  * cpuset_mems_allowed_intersects - Does @tsk1's mems_allowed intersect @tsk2's?
  * @tsk1: pointer to task_struct of some task.

diff --git a/kernel/fork.c b/kernel/fork.c
index cc760491f20127f44ab5db96ec7e858dcce77f54..6ed634f0962132908ad5725408feb1f805550646 100644 (file)
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -2311,7 +2311,6 @@ __latent_entropy struct task_struct *copy_process(
 #endif
 #ifdef CONFIG_CPUSETS
        p->cpuset_mem_spread_rotor = NUMA_NO_NODE;
-       p->cpuset_slab_spread_rotor = NUMA_NO_NODE;
        seqcount_spinlock_init(&p->mems_allowed_seq, &p->alloc_lock);
 #endif
 #ifdef CONFIG_TRACE_IRQFLAGS