[PATCH 2/4] kthreads: Simplify tsk_fork_get_node

[J. Bruce Fields]

From: "J. Bruce Fields" <bfie...@redhat.com>

This will also simplify a following patch that allows multiple
kthreadd's.

Signed-off-by: J. Bruce Fields <bfie...@redhat.com>
---
 init/init_task.c | 3 +++
 kernel/fork.c    | 4 ++++
 kernel/kthread.c | 3 +--
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/init/init_task.c b/init/init_task.c
index bd403ed3e418..fdd760393760 100644
--- a/init/init_task.c
+++ b/init/init_task.c
@@ -154,6 +154,9 @@ struct task_struct init_task
        .vtime.starttime = 0,
        .vtime.state    = VTIME_SYS,
 #endif
+#ifdef CONFIG_NUMA
+       .pref_node_fork = NUMA_NO_NODE,
+#endif
 #ifdef CONFIG_NUMA_BALANCING
        .numa_preferred_nid = NUMA_NO_NODE,
        .numa_group     = NULL,
diff --git a/kernel/fork.c b/kernel/fork.c
index 8c700f881d92..fa35890534d5 100644
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -942,6 +942,10 @@ static struct task_struct *dup_task_struct(struct 
task_struct *orig, int node)
        tsk->fail_nth = 0;
 #endif
 
+#ifdef CONFIG_NUMA
+       tsk->pref_node_fork = NUMA_NO_NODE;
+#endif
+
 #ifdef CONFIG_BLK_CGROUP
        tsk->throttle_queue = NULL;
        tsk->use_memdelay = 0;
diff --git a/kernel/kthread.c b/kernel/kthread.c
index 4217fded891a..483bee57a9c8 100644
--- a/kernel/kthread.c
+++ b/kernel/kthread.c
@@ -274,8 +274,7 @@ static int kthread(void *_create)
 int tsk_fork_get_node(struct task_struct *tsk)
 {
 #ifdef CONFIG_NUMA
-       if (tsk == kthreadd_task)
-               return tsk->pref_node_fork;
+       return tsk->pref_node_fork;
 #endif
        return NUMA_NO_NODE;
 }
-- 
2.26.2