ipvs: Pass ipvs not net to ip_vs_process_message
authorEric W. Biederman <ebiederm@xmission.com>
Mon, 21 Sep 2015 18:02:15 +0000 (13:02 -0500)
committerSimon Horman <horms@verge.net.au>
Thu, 24 Sep 2015 00:34:38 +0000 (09:34 +0900)
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Acked-by: Julian Anastasov <ja@ssi.bg>
Signed-off-by: Simon Horman <horms@verge.net.au>
net/netfilter/ipvs/ip_vs_sync.c

index cd32e3ab0c4d0f96128b8ac483925161614f3799..280e1c03e598d58540ce1ff08499087917add811 100644 (file)
@@ -1204,10 +1204,9 @@ out:
  *      ip_vs_conn entries.
  *      Handles Version 0 & 1
  */
-static void ip_vs_process_message(struct net *net, __u8 *buffer,
+static void ip_vs_process_message(struct netns_ipvs *ipvs, __u8 *buffer,
                                  const size_t buflen)
 {
-       struct netns_ipvs *ipvs = net_ipvs(net);
        struct ip_vs_sync_mesg *m2 = (struct ip_vs_sync_mesg *)buffer;
        __u8 *p, *msg_end;
        int i, nr_conns;
@@ -1257,7 +1256,7 @@ static void ip_vs_process_message(struct net *net, __u8 *buffer,
                                return;
                        }
                        /* Process a single sync_conn */
-                       retc = ip_vs_proc_sync_conn(net, p, msg_end);
+                       retc = ip_vs_proc_sync_conn(ipvs->net, p, msg_end);
                        if (retc < 0) {
                                IP_VS_ERR_RL("BACKUP, Dropping buffer, Err: %d in decoding\n",
                                             retc);
@@ -1763,7 +1762,7 @@ static int sync_thread_backup(void *data)
                                break;
                        }
 
-                       ip_vs_process_message(ipvs->net, tinfo->buf, len);
+                       ip_vs_process_message(ipvs, tinfo->buf, len);
                }
        }