Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable

[mv-sheeva.git] / crypto / af_alg.c

diff --git a/crypto/af_alg.c b/crypto/af_alg.c
index cabed0e9c9d810e2ab3f7a960ded69ed207bc8e5..940d70cb5c25513ae5ffccea5be9d986af8dfad1 100644 (file)
--- a/crypto/af_alg.c
+++ b/crypto/af_alg.c
@@ -27,7 +27,7 @@ struct alg_type_list {
        struct list_head list;
 };
 
-static atomic_t alg_memory_allocated;
+static atomic_long_t alg_memory_allocated;
 
 static struct proto alg_proto = {
        .name                   = "ALG",
@@ -242,6 +242,7 @@ int af_alg_accept(struct sock *sk, struct socket *newsock)
                goto unlock;
 
        sock_init_data(newsock, sk2);
+       sock_graft(sk2, newsock);
 
        err = type->accept(ask->private, sk2);
        if (err) {