IPVS: netns, trash handling

trash list per namspace,
and reordering of some params in dst struct.

[ horms@verge.net.au: Use cancel_delayed_work_sync() instead of
	              cancel_rearming_delayed_work(). Found during
		      merge conflict resoliution ]
Signed-off-by: Hans Schillstrom <hans.schillstrom@ericsson.com>
Acked-by: Julian Anastasov <ja@ssi.bg>
Signed-off-by: Simon Horman <horms@verge.net.au>

1 files changed, 3 insertions, 0 deletions

diff --git a/include/net/netns/ip_vs.h b/include/net/netns/ip_vs.h
index 41332619142c..67ca1cf55af8 100644
--- a/include/net/netns/ip_vs.h
+++ b/include/net/netns/ip_vs.h
@@ -82,6 +82,9 @@ struct netns_ipvs {
         rwlock_t                rs_lock;         /* real services table */
         /* semaphore for IPVS sockopts. And, [gs]etsockopt may sleep. */
         struct lock_class_key   ctl_key;        /* ctl_mutex debuging */
+        /* Trash for destinations */
+        struct list_head        dest_trash;
+
         /* sys-ctl struct */
         struct ctl_table_header *sysctl_hdr;
         struct ctl_table        *sysctl_tbl;