adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-28 03:36:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

user.c: #ifdef ->mq_bytes

Browse source 
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>
This commit is contained in:
Alexey Dobriyan 2007-10-16 23:30:09 -07:00 committed by Linus Torvalds
parent 40aeb400f6
commit 970a8645ca
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/linux/sched.h
View file

@ -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

4
kernel/user.c
View file

@ -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) {