git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
kernel
/
user.c
diff --git
a/kernel/user.c
b/kernel/user.c
index
bcbd0b3
..
640ee48
100644
(file)
--- a/
kernel/user.c
+++ b/
kernel/user.c
@@
-141,7
+141,7
@@
struct user_struct * alloc_uid(xid_t xid, uid_t uid)
atomic_set(&new->processes, 0);
atomic_set(&new->files, 0);
atomic_set(&new->sigpending, 0);
atomic_set(&new->processes, 0);
atomic_set(&new->files, 0);
atomic_set(&new->sigpending, 0);
-#ifdef CONFIG_INOTIFY
+#ifdef CONFIG_INOTIFY
_USER
atomic_set(&new->inotify_watches, 0);
atomic_set(&new->inotify_devs, 0);
#endif
atomic_set(&new->inotify_watches, 0);
atomic_set(&new->inotify_devs, 0);
#endif
@@
-149,7
+149,7
@@
struct user_struct * alloc_uid(xid_t xid, uid_t uid)
new->mq_bytes = 0;
new->locked_shm = 0;
new->mq_bytes = 0;
new->locked_shm = 0;
- if (alloc_uid_keyring(new) < 0) {
+ if (alloc_uid_keyring(new
, current
) < 0) {
kmem_cache_free(uid_cachep, new);
return NULL;
}
kmem_cache_free(uid_cachep, new);
return NULL;
}