From: Akinobu Mita This patch converts the combination of list_del(A) and list_add(A, B) to list_move(A, B) under net/rxrpc. Acked-by: David Howells Signed-off-by: Akinobu Mita Signed-off-by: Andrew Morton --- net/rxrpc/call.c | 3 +-- net/rxrpc/connection.c | 3 +-- net/rxrpc/krxsecd.c | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff -puN net/rxrpc/call.c~net-rxrpc-use-list_move net/rxrpc/call.c --- devel/net/rxrpc/call.c~net-rxrpc-use-list_move 2006-06-06 17:31:25.000000000 -0700 +++ devel-akpm/net/rxrpc/call.c 2006-06-06 17:31:25.000000000 -0700 @@ -1098,8 +1098,7 @@ static void rxrpc_call_receive_data_pack call->app_ready_seq = pmsg->seq; call->app_ready_qty += pmsg->dsize; - list_del_init(&pmsg->link); - list_add_tail(&pmsg->link, &call->app_readyq); + list_move_tail(&pmsg->link, &call->app_readyq); } /* see if we've got the last packet yet */ diff -puN net/rxrpc/connection.c~net-rxrpc-use-list_move net/rxrpc/connection.c --- devel/net/rxrpc/connection.c~net-rxrpc-use-list_move 2006-06-06 17:31:25.000000000 -0700 +++ devel-akpm/net/rxrpc/connection.c 2006-06-06 17:31:25.000000000 -0700 @@ -402,8 +402,7 @@ void rxrpc_put_connection(struct rxrpc_c /* 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); diff -puN net/rxrpc/krxsecd.c~net-rxrpc-use-list_move net/rxrpc/krxsecd.c --- devel/net/rxrpc/krxsecd.c~net-rxrpc-use-list_move 2006-06-06 17:31:25.000000000 -0700 +++ devel-akpm/net/rxrpc/krxsecd.c 2006-06-06 17:31:25.000000000 -0700 @@ -160,8 +160,7 @@ void rxrpc_krxsecd_clear_transport(struc list_for_each_safe(_p, _n, &rxrpc_krxsecd_initmsgq) { msg = list_entry(_p, struct rxrpc_message, link); if (msg->trans == trans) { - list_del(&msg->link); - list_add_tail(&msg->link, &tmp); + list_move_tail(&msg->link, &tmp); atomic_dec(&rxrpc_krxsecd_qcount); } } _