Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit c2b42336f4a733020360157ba629d37f1410923a

Authored by Pavel Emelyanov
Committed by David S. Miller
1 parent 17ab56a260
Exists in master and in 39 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.0.35_4.1.0, 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

[IPX]: Use existing sock refcnt debugging infrastructure 

Just like in the af_packet.c, the ipx_sock_nr variable is used
for debugging purposes.

Switch to using existing infrastructure. Thanks to Arnaldo for
pointing this out.

Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
Acked-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

Showing 1 changed file with 4 additions and 18 deletions Side-by-side Diff

... ... @@ -92,11 +92,6 @@
92 92 extern struct ipx_route *ipxrtr_lookup(__be32 net);
93 93 extern int ipxrtr_ioctl(unsigned int cmd, void __user *arg);
94 94  
95   -#undef IPX_REFCNT_DEBUG
96   -#ifdef IPX_REFCNT_DEBUG
97   -atomic_t ipx_sock_nr;
98   -#endif
99   -
100 95 struct ipx_interface *ipx_interfaces_head(void)
101 96 {
102 97 struct ipx_interface *rc = NULL;
... ... @@ -151,14 +146,7 @@
151 146 {
152 147 ipx_remove_socket(sk);
153 148 skb_queue_purge(&sk->sk_receive_queue);
154   -#ifdef IPX_REFCNT_DEBUG
155   - atomic_dec(&ipx_sock_nr);
156   - printk(KERN_DEBUG "IPX socket %p released, %d are still alive\n", sk,
157   - atomic_read(&ipx_sock_nr));
158   - if (atomic_read(&sk->sk_refcnt) != 1)
159   - printk(KERN_DEBUG "Destruction sock ipx %p delayed, cnt=%d\n",
160   - sk, atomic_read(&sk->sk_refcnt));
161   -#endif
  149 + sk_refcnt_debug_dec(sk);
162 150 sock_put(sk);
163 151 }
164 152  
... ... @@ -1384,11 +1372,8 @@
1384 1372 sk = sk_alloc(net, PF_IPX, GFP_KERNEL, &ipx_proto);
1385 1373 if (!sk)
1386 1374 goto out;
1387   -#ifdef IPX_REFCNT_DEBUG
1388   - atomic_inc(&ipx_sock_nr);
1389   - printk(KERN_DEBUG "IPX socket %p created, now we have %d alive\n", sk,
1390   - atomic_read(&ipx_sock_nr));
1391   -#endif
  1375 +
  1376 + sk_refcnt_debug_inc(sk);
1392 1377 sock_init_data(sock, sk);
1393 1378 sk->sk_no_check = 1; /* Checksum off by default */
1394 1379 sock->ops = &ipx_dgram_ops;
... ... @@ -1409,6 +1394,7 @@
1409 1394  
1410 1395 sock_set_flag(sk, SOCK_DEAD);
1411 1396 sock->sk = NULL;
  1397 + sk_refcnt_debug_release(sk);
1412 1398 ipx_destroy_socket(sk);
1413 1399 out:
1414 1400 return 0;