Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e8cfbc24 authored by Gargi Sharma's avatar Gargi Sharma Committed by Linus Torvalds
Browse files

pid: remove pidhash 

pidhash is no longer required as all the information can be looked up
from idr tree.  nr_hashed represented the number of pids that had been
hashed.  Since, nr_hashed and PIDNS_HASH_ADDING are no longer relevant,
it has been renamed to pid_allocated and PIDNS_ADDING respectively.

[gs051095@gmail.com: v6]
  Link: http://lkml.kernel.org/r/1507760379-21662-3-git-send-email-gs051095@gmail.com
Link: http://lkml.kernel.org/r/1507583624-22146-3-git-send-email-gs051095@gmail.com


Signed-off-by: default avatarGargi Sharma <gs051095@gmail.com>
Reviewed-by: default avatarRik van Riel <riel@redhat.com>
Tested-by: Tony Luck <tony.luck@intel.com>	[ia64]
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: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 95846ecf

arch/ia64/kernel/asm-offsets.c

+2 −2
Original line number Diff line number Diff line
@@ -31,8 +31,8 @@ void foo(void) 
	DEFINE(SIGFRAME_SIZE, sizeof (struct sigframe));

	DEFINE(UNW_FRAME_INFO_SIZE, sizeof (struct unw_frame_info));



	BUILD_BUG_ON(sizeof(struct upid) != 32);

	DEFINE(IA64_UPID_SHIFT, 5);

	BUILD_BUG_ON(sizeof(struct upid) != 16);

	DEFINE(IA64_UPID_SHIFT, 4);



	BLANK();

include/linux/init_task.h

+0 −1
Original line number Diff line number Diff line
@@ -105,7 +105,6 @@ extern struct group_info init_groups; 
	.numbers	= { {						\

		.nr		= 0,					\

		.ns		= &init_pid_ns,				\

		.pid_chain	= { .next = NULL, .pprev = NULL },	\

	}, }								\

}

include/linux/pid.h

+0 −2
Original line number Diff line number Diff line
@@ -51,10 +51,8 @@ enum pid_type 
 */



struct upid {

	/* Try to keep pid_chain in the same cacheline as nr for find_vpid */

	int nr;

	struct pid_namespace *ns;

	struct hlist_node pid_chain;

};



struct pid

include/linux/pid_namespace.h

+2 −2
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ struct pid_namespace { 
	struct kref kref;

	struct idr idr;

	struct rcu_head rcu;

	unsigned int nr_hashed;

	unsigned int pid_allocated;

	struct task_struct *child_reaper;

	struct kmem_cache *pid_cachep;

	unsigned int level;
@@ -49,7 +49,7 @@ struct pid_namespace { 


extern struct pid_namespace init_pid_ns;



#define PIDNS_HASH_ADDING (1U << 31)

#define PIDNS_ADDING (1U << 31)



#ifdef CONFIG_PID_NS

static inline struct pid_namespace *get_pid_ns(struct pid_namespace *ns)

init/main.c

+0 −1
Original line number Diff line number Diff line
@@ -562,7 +562,6 @@ asmlinkage __visible void __init start_kernel(void) 
	 * kmem_cache_init()

	 */

	setup_log_buf(0);

	pidhash_init();

	vfs_caches_init_early();

	sort_main_extable();

	trap_init();