[folded-merged] pid-replace-pid-bitmap-implementation-with-idr-api-v6.patch removed from -mm tree

[folded-merged] pid-replace-pid-bitmap-implementation-with-idr-api-v6.patch removed from -mm tree

[akpm]

The patch titled
     Subject: pid-replace-pid-bitmap-implementation-with-idr-api-v6
has been removed from the -mm tree.  Its filename was
     pid-replace-pid-bitmap-implementation-with-idr-api-v6.patch

This patch was dropped because it was folded into pid-replace-pid-bitmap-implementation-with-idr-api.patch

------------------------------------------------------
From: Gargi Sharma <gs051095@gmail.com>
Subject: pid-replace-pid-bitmap-implementation-with-idr-api-v6

Link: http://lkml.kernel.org/r/1507760379-21662-2-git-send-email-gs051095@gmail.com
Signed-off-by: Gargi Sharma <gs051095@gmail.com>
Reviewed-by: Rik van Riel <riel@redhat.com>
Cc: Julia Lawall <julia.lawall@lip6.fr>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Pavel Tatashin <pasha.tatashin@oracle.com>
Cc: Kirill Tkhai <ktkhai@virtuozzo.com>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Eric W. Biederman <ebiederm@xmission.com>
Cc: Christoph Hellwig <hch@infradead.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 kernel/pid.c           |    6 ++++--
 kernel/pid_namespace.c |    2 ++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff -puN kernel/pid.c~pid-replace-pid-bitmap-implementation-with-idr-api-v6 kernel/pid.c
--- a/kernel/pid.c~pid-replace-pid-bitmap-implementation-with-idr-api-v6
+++ a/kernel/pid.c
@@ -124,7 +124,7 @@ void free_pid(struct pid *pid)
 		struct upid *upid = pid->numbers + i;
 		struct pid_namespace *ns = upid->ns;
 		hlist_del_rcu(&upid->pid_chain);
-		switch(--ns->nr_hashed) {
+		switch (--ns->nr_hashed) {
 		case 2:
 		case 1:
 			/* When all that is left in the pid namespace
@@ -168,6 +168,7 @@ struct pid *alloc_pid(struct pid_namespa
 
 	for (i = ns->level; i >= 0; i--) {
 		int pid_min = 1;
+
 		idr_preload(GFP_KERNEL);
 		spin_lock_irq(&pidmap_lock);
 
@@ -178,7 +179,8 @@ struct pid *alloc_pid(struct pid_namespa
 		if (idr_get_cursor(&tmp->idr) > RESERVED_PIDS)
 			pid_min = RESERVED_PIDS;
 
-		/* Store a null pointer so find_pid_ns does not find             *
+		/*
+		 * Store a null pointer so find_pid_ns does not find
 		 * a partially initialized PID (see below).
 		 */
 		nr = idr_alloc_cyclic(&tmp->idr, NULL, pid_min,
diff -puN kernel/pid_namespace.c~pid-replace-pid-bitmap-implementation-with-idr-api-v6 kernel/pid_namespace.c
--- a/kernel/pid_namespace.c~pid-replace-pid-bitmap-implementation-with-idr-api-v6
+++ a/kernel/pid_namespace.c
@@ -229,6 +229,7 @@ void zap_pid_ns_processes(struct pid_nam
 	 * 	  maintain a tasklist for each pid namespace.
 	 *
 	 */
+	rcu_read_lock();
 	read_lock(&tasklist_lock);
 	nr = 2;
 	idr_for_each_entry_continue(&pid_ns->idr, pid, nr) {
@@ -237,6 +238,7 @@ void zap_pid_ns_processes(struct pid_nam
 			send_sig_info(SIGKILL, SEND_SIG_FORCED, task);
 	}
 	read_unlock(&tasklist_lock);
+	rcu_read_unlock();
 
 	/*
 	 * Reap the EXIT_ZOMBIE children we had before we ignored SIGCHLD.
_

Patches currently in -mm which might be from gs051095@gmail.com are

pid-replace-pid-bitmap-implementation-with-idr-api.patch
pid-remove-pidhash.patch
pid-remove-pidhash-v6.patch