Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 493d3971a65c921fad5c3369c7582214c91c965a

Authored by Ursula Braun
Committed by David S. Miller
1 parent 6fcd61f7bf
Exists in master and in 38 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

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>

Showing 1 changed file with 23 additions and 21 deletions Side-by-side Diff

... ... @@ -446,23 +446,25 @@
446 446 static struct sock *iucv_sock_alloc(struct socket *sock, int proto, gfp_t prio)
447 447 {
448 448 struct sock *sk;
  449 + struct iucv_sock *iucv;
449 450  
450 451 sk = sk_alloc(&init_net, PF_IUCV, prio, &iucv_proto);
451 452 if (!sk)
452 453 return NULL;
  454 + iucv = iucv_sk(sk);
453 455  
454 456 sock_init_data(sock, sk);
455   - INIT_LIST_HEAD(&iucv_sk(sk)->accept_q);
456   - spin_lock_init(&iucv_sk(sk)->accept_q_lock);
457   - skb_queue_head_init(&iucv_sk(sk)->send_skb_q);
458   - INIT_LIST_HEAD(&iucv_sk(sk)->message_q.list);
459   - spin_lock_init(&iucv_sk(sk)->message_q.lock);
460   - skb_queue_head_init(&iucv_sk(sk)->backlog_skb_q);
461   - iucv_sk(sk)->send_tag = 0;
462   - iucv_sk(sk)->flags = 0;
463   - iucv_sk(sk)->msglimit = IUCV_QUEUELEN_DEFAULT;
464   - iucv_sk(sk)->path = NULL;
465   - memset(&iucv_sk(sk)->src_user_id , 0, 32);
  457 + INIT_LIST_HEAD(&iucv->accept_q);
  458 + spin_lock_init(&iucv->accept_q_lock);
  459 + skb_queue_head_init(&iucv->send_skb_q);
  460 + INIT_LIST_HEAD(&iucv->message_q.list);
  461 + spin_lock_init(&iucv->message_q.lock);
  462 + skb_queue_head_init(&iucv->backlog_skb_q);
  463 + iucv->send_tag = 0;
  464 + iucv->flags = 0;
  465 + iucv->msglimit = IUCV_QUEUELEN_DEFAULT;
  466 + iucv->path = NULL;
  467 + memset(&iucv->src_user_id , 0, 32);
466 468  
467 469 sk->sk_destruct = iucv_sock_destruct;
468 470 sk->sk_sndtimeo = IUCV_CONN_TIMEOUT;
... ... @@ -669,7 +671,7 @@
669 671 {
670 672 struct sockaddr_iucv *sa = (struct sockaddr_iucv *) addr;
671 673 struct sock *sk = sock->sk;
672   - struct iucv_sock *iucv;
  674 + struct iucv_sock *iucv = iucv_sk(sk);
673 675 unsigned char user_data[16];
674 676 int err;
675 677  
676 678  
677 679  
... ... @@ -691,14 +693,13 @@
691 693 lock_sock(sk);
692 694  
693 695 /* Set the destination information */
694   - memcpy(iucv_sk(sk)->dst_user_id, sa->siucv_user_id, 8);
695   - memcpy(iucv_sk(sk)->dst_name, sa->siucv_name, 8);
  696 + memcpy(iucv->dst_user_id, sa->siucv_user_id, 8);
  697 + memcpy(iucv->dst_name, sa->siucv_name, 8);
696 698  
697 699 high_nmcpy(user_data, sa->siucv_name);
698   - low_nmcpy(user_data, iucv_sk(sk)->src_name);
  700 + low_nmcpy(user_data, iucv->src_name);
699 701 ASCEBC(user_data, sizeof(user_data));
700 702  
701   - iucv = iucv_sk(sk);
702 703 /* Create path. */
703 704 iucv->path = iucv_path_alloc(iucv->msglimit,
704 705 IUCV_IPRMDATA, GFP_KERNEL);
705 706  
706 707  
707 708  
... ... @@ -836,20 +837,21 @@
836 837 {
837 838 struct sockaddr_iucv *siucv = (struct sockaddr_iucv *) addr;
838 839 struct sock *sk = sock->sk;
  840 + struct iucv_sock *iucv = iucv_sk(sk);
839 841  
840 842 addr->sa_family = AF_IUCV;
841 843 *len = sizeof(struct sockaddr_iucv);
842 844  
843 845 if (peer) {
844   - memcpy(siucv->siucv_user_id, iucv_sk(sk)->dst_user_id, 8);
845   - memcpy(siucv->siucv_name, &iucv_sk(sk)->dst_name, 8);
  846 + memcpy(siucv->siucv_user_id, iucv->dst_user_id, 8);
  847 + memcpy(siucv->siucv_name, iucv->dst_name, 8);
846 848 } else {
847   - memcpy(siucv->siucv_user_id, iucv_sk(sk)->src_user_id, 8);
848   - memcpy(siucv->siucv_name, iucv_sk(sk)->src_name, 8);
  849 + memcpy(siucv->siucv_user_id, iucv->src_user_id, 8);
  850 + memcpy(siucv->siucv_name, iucv->src_name, 8);
849 851 }
850 852 memset(&siucv->siucv_port, 0, sizeof(siucv->siucv_port));
851 853 memset(&siucv->siucv_addr, 0, sizeof(siucv->siucv_addr));
852   - memset(siucv->siucv_nodeid, 0, sizeof(siucv->siucv_nodeid));
  854 + memset(&siucv->siucv_nodeid, 0, sizeof(siucv->siucv_nodeid));
853 855  
854 856 return 0;
855 857 }