Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa...

[~andy/linux] / net / rds / connection.c

diff --git a/net/rds/connection.c b/net/rds/connection.c
index 273f064930a8e1aec7f8539ed54d928447e7a53a..d14445c48304cb3f4b7a946372186d8578a9b530 100644 (file)
--- a/net/rds/connection.c
+++ b/net/rds/connection.c
@@ -148,14 +148,12 @@ static struct rds_connection *__rds_conn_create(__be32 laddr, __be32 faddr,
        if (conn)
                goto out;
 
-       conn = kmem_cache_alloc(rds_conn_slab, gfp);
+       conn = kmem_cache_zalloc(rds_conn_slab, gfp);
        if (conn == NULL) {
                conn = ERR_PTR(-ENOMEM);
                goto out;
        }
 
-       memset(conn, 0, sizeof(*conn));
-
        INIT_HLIST_NODE(&conn->c_hash_node);
        conn->c_version = RDS_PROTOCOL_3_0;
        conn->c_laddr = laddr;