inet: rename some inet_sock fields

In order to have better cache layouts of struct sock (separate zones
for rx/tx paths), we need this preliminary patch.

Goal is to transfert fields used at lookup time in the first
read-mostly cache line (inside struct sock_common) and move sk_refcnt
to a separate cache line (only written by rx path)

This patch adds inet_ prefix to daddr, rcv_saddr, dport, num, saddr,
sport and id fields. This allows a future patch to define these
fields as macros, like sk_refcnt, without name clashes.

Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 7 insertions, 6 deletions

diff --git a/net/dccp/probe.c b/net/dccp/probe.c
index 5e6ec8b9b7b6..dc328425fa20 100644
--- a/net/dccp/probe.c
+++ b/net/dccp/probe.c
@@ -80,19 +80,20 @@ static int jdccp_sendmsg(struct kiocb *iocb, struct sock *sk,
         if (ccid_get_current_tx_ccid(dccp_sk(sk)) == DCCPC_CCID3)
                 hc = ccid3_hc_tx_sk(sk);
 
-        if (port == 0 || ntohs(inet->dport) == port ||
-            ntohs(inet->sport) == port) {
+        if (port == 0 || ntohs(inet->inet_dport) == port ||
+            ntohs(inet->inet_sport) == port) {
                 if (hc)
                         printl("%pI4:%u %pI4:%u %d %d %d %d %u %llu %llu %d\n",
-                               &inet->saddr, ntohs(inet->sport),
-                               &inet->daddr, ntohs(inet->dport), size,
+                               &inet->inet_saddr, ntohs(inet->inet_sport),
+                               &inet->inet_daddr, ntohs(inet->inet_dport), size,
                                hc->tx_s, hc->tx_rtt, hc->tx_p,
                                hc->tx_x_calc, hc->tx_x_recv >> 6,
                                hc->tx_x >> 6, hc->tx_t_ipi);
                 else
                         printl("%pI4:%u %pI4:%u %d\n",
-                               &inet->saddr, ntohs(inet->sport),
-                               &inet->daddr, ntohs(inet->dport), size);
+                               &inet->inet_saddr, ntohs(inet->inet_sport),
+                               &inet->inet_daddr, ntohs(inet->inet_dport),
+                               size);
         }
 
         jprobe_return();