UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

af_iucv: cleanup - use iucv_sk(sk) early 

Code cleanup making make use of local variable for struct iucv_sock.

Signed-off-by: Ursula Braun <ursula.braun@de.ibm.com>
Signed-off-by: Frank Blaschka <frank.blaschka@de.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Ursula Braun 2011-08-08 01:33:52 +00:00 committed by David S. Miller
parent 6fcd61f7bf
commit 493d3971a6
1 changed files with 23 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
net/iucv/af_iucv.c
View File

@ -446,23 +446,25 @@ static void iucv_sock_init(struct sock *sk, struct sock *parent)
static struct sock *iucv_sock_alloc(struct socket *sock, int proto, gfp_t prio) static struct sock *iucv_sock_alloc(struct socket *sock, int proto, gfp_t prio)
{ {
struct sock *sk; struct sock *sk;
struct iucv_sock *iucv;
sk = sk_alloc(&init_net, PF_IUCV, prio, &iucv_proto); sk = sk_alloc(&init_net, PF_IUCV, prio, &iucv_proto);
if (!sk) if (!sk)
return NULL; return NULL;
iucv = iucv_sk(sk);
sock_init_data(sock, sk); sock_init_data(sock, sk);
INIT_LIST_HEAD(&iucv_sk(sk)->accept_q); INIT_LIST_HEAD(&iucv->accept_q);
spin_lock_init(&iucv_sk(sk)->accept_q_lock); spin_lock_init(&iucv->accept_q_lock);
skb_queue_head_init(&iucv_sk(sk)->send_skb_q); skb_queue_head_init(&iucv->send_skb_q);
INIT_LIST_HEAD(&iucv_sk(sk)->message_q.list); INIT_LIST_HEAD(&iucv->message_q.list);
spin_lock_init(&iucv_sk(sk)->message_q.lock); spin_lock_init(&iucv->message_q.lock);
skb_queue_head_init(&iucv_sk(sk)->backlog_skb_q); skb_queue_head_init(&iucv->backlog_skb_q);
iucv_sk(sk)->send_tag = 0; iucv->send_tag = 0;
iucv_sk(sk)->flags = 0; iucv->flags = 0;
iucv_sk(sk)->msglimit = IUCV_QUEUELEN_DEFAULT; iucv->msglimit = IUCV_QUEUELEN_DEFAULT;
iucv_sk(sk)->path = NULL; iucv->path = NULL;
memset(&iucv_sk(sk)->src_user_id , 0, 32); memset(&iucv->src_user_id , 0, 32);
sk->sk_destruct = iucv_sock_destruct; sk->sk_destruct = iucv_sock_destruct;
sk->sk_sndtimeo = IUCV_CONN_TIMEOUT; sk->sk_sndtimeo = IUCV_CONN_TIMEOUT;
@ -669,7 +671,7 @@ static int iucv_sock_connect(struct socket *sock, struct sockaddr *addr,
{ {
struct sockaddr_iucv *sa = (struct sockaddr_iucv *) addr; struct sockaddr_iucv *sa = (struct sockaddr_iucv *) addr;
struct sock *sk = sock->sk; struct sock *sk = sock->sk;
struct iucv_sock *iucv; struct iucv_sock *iucv = iucv_sk(sk);
unsigned char user_data[16]; unsigned char user_data[16];
int err; int err;
@ -691,14 +693,13 @@ static int iucv_sock_connect(struct socket *sock, struct sockaddr *addr,
lock_sock(sk); lock_sock(sk);
/* Set the destination information */ /* Set the destination information */
memcpy(iucv_sk(sk)->dst_user_id, sa->siucv_user_id, 8); memcpy(iucv->dst_user_id, sa->siucv_user_id, 8);
memcpy(iucv_sk(sk)->dst_name, sa->siucv_name, 8); memcpy(iucv->dst_name, sa->siucv_name, 8);
high_nmcpy(user_data, sa->siucv_name); high_nmcpy(user_data, sa->siucv_name);
low_nmcpy(user_data, iucv_sk(sk)->src_name); low_nmcpy(user_data, iucv->src_name);
ASCEBC(user_data, sizeof(user_data)); ASCEBC(user_data, sizeof(user_data));
iucv = iucv_sk(sk);
/* Create path. */ /* Create path. */
iucv->path = iucv_path_alloc(iucv->msglimit, iucv->path = iucv_path_alloc(iucv->msglimit,
IUCV_IPRMDATA, GFP_KERNEL); IUCV_IPRMDATA, GFP_KERNEL);
@ -836,20 +837,21 @@ static int iucv_sock_getname(struct socket *sock, struct sockaddr *addr,
{ {
struct sockaddr_iucv *siucv = (struct sockaddr_iucv *) addr; struct sockaddr_iucv *siucv = (struct sockaddr_iucv *) addr;
struct sock *sk = sock->sk; struct sock *sk = sock->sk;
struct iucv_sock *iucv = iucv_sk(sk);
addr->sa_family = AF_IUCV; addr->sa_family = AF_IUCV;
*len = sizeof(struct sockaddr_iucv); *len = sizeof(struct sockaddr_iucv);
if (peer) { if (peer) {
memcpy(siucv->siucv_user_id, iucv_sk(sk)->dst_user_id, 8); memcpy(siucv->siucv_user_id, iucv->dst_user_id, 8);
memcpy(siucv->siucv_name, &iucv_sk(sk)->dst_name, 8); memcpy(siucv->siucv_name, iucv->dst_name, 8);
} else { } else {
memcpy(siucv->siucv_user_id, iucv_sk(sk)->src_user_id, 8); memcpy(siucv->siucv_user_id, iucv->src_user_id, 8);
memcpy(siucv->siucv_name, iucv_sk(sk)->src_name, 8); memcpy(siucv->siucv_name, iucv->src_name, 8);
} }
memset(&siucv->siucv_port, 0, sizeof(siucv->siucv_port)); memset(&siucv->siucv_port, 0, sizeof(siucv->siucv_port));
memset(&siucv->siucv_addr, 0, sizeof(siucv->siucv_addr)); memset(&siucv->siucv_addr, 0, sizeof(siucv->siucv_addr));
memset(siucv->siucv_nodeid, 0, sizeof(siucv->siucv_nodeid)); memset(&siucv->siucv_nodeid, 0, sizeof(siucv->siucv_nodeid));
return 0; return 0;
} }