[merged] pidns-remove-unused-is_container_init.patch removed from -mm tree

[akpm@linux-foundation.org]

The patch titled
     Subject: pidns: remove unused is_container_init()
has been removed from the -mm tree.  Its filename was
     pidns-remove-unused-is_container_init.patch

This patch was dropped because it was merged into mainline or a subsystem tree

------------------------------------------------------
From: Gao feng <gaofeng@cn.fujitsu.com>
Subject: pidns: remove unused is_container_init()

Since commit 1cdcbec1a3 ("CRED: Neuter sys_capset()") is_container_init()
has no callers.

Signed-off-by: Gao feng <gaofeng@cn.fujitsu.com>
Cc: David Howells <dhowells@redhat.com>
Acked-by: Serge Hallyn <serge.hallyn@canonical.com>
Cc: James Morris <jmorris@namei.org>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 include/linux/sched.h |    6 ------
 kernel/pid.c          |   15 ---------------
 2 files changed, 21 deletions(-)

diff -puN include/linux/sched.h~pidns-remove-unused-is_container_init include/linux/sched.h
--- a/include/linux/sched.h~pidns-remove-unused-is_container_init
+++ a/include/linux/sched.h
@@ -1778,12 +1778,6 @@ static inline int is_global_init(struct 
 	return tsk->pid == 1;
 }
 
-/*
- * is_container_init:
- * check whether in the task is init in its own pid namespace.
- */
-extern int is_container_init(struct task_struct *tsk);
-
 extern struct pid *cad_pid;
 
 extern void free_task(struct task_struct *tsk);
diff -puN kernel/pid.c~pidns-remove-unused-is_container_init kernel/pid.c
--- a/kernel/pid.c~pidns-remove-unused-is_container_init
+++ a/kernel/pid.c
@@ -81,21 +81,6 @@ struct pid_namespace init_pid_ns = {
 };
 EXPORT_SYMBOL_GPL(init_pid_ns);
 
-int is_container_init(struct task_struct *tsk)
-{
-	int ret = 0;
-	struct pid *pid;
-
-	rcu_read_lock();
-	pid = task_pid(tsk);
-	if (pid != NULL && pid->numbers[pid->level].nr == 1)
-		ret = 1;
-	rcu_read_unlock();
-
-	return ret;
-}
-EXPORT_SYMBOL(is_container_init);