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, 4 insertions, 4 deletions

diff --git a/net/rds/tcp_listen.c b/net/rds/tcp_listen.c
index 24b743eb0b1b..45474a436862 100644
--- a/net/rds/tcp_listen.c
+++ b/net/rds/tcp_listen.c
@@ -67,11 +67,11 @@ static int rds_tcp_accept_one(struct socket *sock)
         inet = inet_sk(new_sock->sk);
 
         rdsdebug("accepted tcp %u.%u.%u.%u:%u -> %u.%u.%u.%u:%u\n",
-                  NIPQUAD(inet->saddr), ntohs(inet->sport),
-                  NIPQUAD(inet->daddr), ntohs(inet->dport));
+                  NIPQUAD(inet->inet_saddr), ntohs(inet->inet_sport),
+                  NIPQUAD(inet->inet_daddr), ntohs(inet->inet_dport));
 
-        conn = rds_conn_create(inet->saddr, inet->daddr, &rds_tcp_transport,
-                               GFP_KERNEL);
+        conn = rds_conn_create(inet->inet_saddr, inet->inet_daddr,
+                               &rds_tcp_transport, GFP_KERNEL);
         if (IS_ERR(conn)) {
                 ret = PTR_ERR(conn);
                 goto out;