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

Commit 970a8645 authored Oct 16, 2007 by Alexey Dobriyan Committed by Linus Torvalds Oct 17, 2007

user.c: #ifdef ->mq_bytes



For those who deselect POSIX message queues.

Reduces SLAB size of user_struct from 64 to 32 bytes here, SLUB size -- from
40 bytes to 32 bytes.

[akpm@linux-foundation.org: fix build]
Signed-off-by: Alexey Dobriyan <adobriyan@sw.ru>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 40aeb400

include/linux/sched.h

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -518,8 +518,10 @@ struct user_struct {
	atomic_t inotify_watches; /* How many inotify watches does this user have? */		atomic_t inotify_watches; /* How many inotify watches does this user have? */
	atomic_t inotify_devs; /* How many inotify devs does this user have opened? */		atomic_t inotify_devs; /* How many inotify devs does this user have opened? */
	#endif		#endif
			#ifdef CONFIG_POSIX_MQUEUE
	/* protected by mq_lock */		/* protected by mq_lock */
	unsigned long mq_bytes; /* How many bytes can be allocated to mqueue? */		unsigned long mq_bytes; /* How many bytes can be allocated to mqueue? */
			#endif
	unsigned long locked_shm; /* How many pages of mlocked shm ? */		unsigned long locked_shm; /* How many pages of mlocked shm ? */

	#ifdef CONFIG_KEYS		#ifdef CONFIG_KEYS

kernel/user.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -44,7 +44,6 @@ struct user_struct root_user = {
	.processes = ATOMIC_INIT(1),		.processes = ATOMIC_INIT(1),
	.files = ATOMIC_INIT(0),		.files = ATOMIC_INIT(0),
	.sigpending = ATOMIC_INIT(0),		.sigpending = ATOMIC_INIT(0),
	.mq_bytes = 0,
	.locked_shm = 0,		.locked_shm = 0,
	#ifdef CONFIG_KEYS		#ifdef CONFIG_KEYS
	.uid_keyring = &root_user_keyring,		.uid_keyring = &root_user_keyring,
	@@ -341,8 +340,9 @@ struct user_struct * alloc_uid(struct user_namespace *ns, uid_t uid)
	atomic_set(&new->inotify_watches, 0);		atomic_set(&new->inotify_watches, 0);
	atomic_set(&new->inotify_devs, 0);		atomic_set(&new->inotify_devs, 0);
	#endif		#endif
			#ifdef CONFIG_POSIX_MQUEUE
	new->mq_bytes = 0;		new->mq_bytes = 0;
			#endif
	new->locked_shm = 0;		new->locked_shm = 0;

	if (alloc_uid_keyring(new, current) < 0) {		if (alloc_uid_keyring(new, current) < 0) {