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]
/
net
/
rxrpc
/
connection.c
diff --git
a/net/rxrpc/connection.c
b/net/rxrpc/connection.c
index
0e0a455
..
93d2c55
100644
(file)
--- a/
net/rxrpc/connection.c
+++ b/
net/rxrpc/connection.c
@@
-58,13
+58,12
@@
static inline int __rxrpc_create_connection(struct rxrpc_peer *peer,
_enter("%p",peer);
/* allocate and initialise a connection record */
_enter("%p",peer);
/* allocate and initialise a connection record */
- conn = k
m
alloc(sizeof(struct rxrpc_connection), GFP_KERNEL);
+ conn = k
z
alloc(sizeof(struct rxrpc_connection), GFP_KERNEL);
if (!conn) {
_leave(" = -ENOMEM");
return -ENOMEM;
}
if (!conn) {
_leave(" = -ENOMEM");
return -ENOMEM;
}
- memset(conn, 0, sizeof(struct rxrpc_connection));
atomic_set(&conn->usage, 1);
INIT_LIST_HEAD(&conn->link);
atomic_set(&conn->usage, 1);
INIT_LIST_HEAD(&conn->link);
@@
-402,8
+401,7
@@
void rxrpc_put_connection(struct rxrpc_connection *conn)
/* move to graveyard queue */
_debug("burying connection: {%08x}", ntohl(conn->conn_id));
/* move to graveyard queue */
_debug("burying connection: {%08x}", ntohl(conn->conn_id));
- list_del(&conn->link);
- list_add_tail(&conn->link, &peer->conn_graveyard);
+ list_move_tail(&conn->link, &peer->conn_graveyard);
rxrpc_krxtimod_add_timer(&conn->timeout, rxrpc_conn_timeout * HZ);
rxrpc_krxtimod_add_timer(&conn->timeout, rxrpc_conn_timeout * HZ);
@@
-536,13
+534,12
@@
int rxrpc_conn_newmsg(struct rxrpc_connection *conn,
return -EINVAL;
}
return -EINVAL;
}
- msg = k
m
alloc(sizeof(struct rxrpc_message), alloc_flags);
+ msg = k
z
alloc(sizeof(struct rxrpc_message), alloc_flags);
if (!msg) {
_leave(" = -ENOMEM");
return -ENOMEM;
}
if (!msg) {
_leave(" = -ENOMEM");
return -ENOMEM;
}
- memset(msg, 0, sizeof(*msg));
atomic_set(&msg->usage, 1);
INIT_LIST_HEAD(&msg->link);
atomic_set(&msg->usage, 1);
INIT_LIST_HEAD(&msg->link);