e1000e: Add missing dma_mapping_error-call in e1000_alloc_jumbo_rx_buffers

[pandora-kernel.git] / kernel / user.c

diff --git a/kernel/user.c b/kernel/user.c
index 33acb5e..e81978e 100644 (file)
--- a/kernel/user.c
+++ b/kernel/user.c
@@ -47,9 +47,7 @@ struct user_namespace init_user_ns = {
                        .count = 4294967295U,
                },
        },
-       .kref = {
-               .refcount       = ATOMIC_INIT(3),
-       },
+       .count = ATOMIC_INIT(3),
        .owner = GLOBAL_ROOT_UID,
        .group = GLOBAL_ROOT_GID,
        .proc_inum = PROC_USER_INIT_INO,
@@ -107,9 +105,8 @@ static void uid_hash_remove(struct user_struct *up)
 static struct user_struct *uid_hash_find(kuid_t uid, struct hlist_head *hashent)
 {
        struct user_struct *user;
-       struct hlist_node *h;
 
-       hlist_for_each_entry(user, h, hashent, uidhash_node) {
+       hlist_for_each_entry(user, hashent, uidhash_node) {
                if (uid_eq(user->uid, uid)) {
                        atomic_inc(&user->__count);
                        return user;