diff --git a/[refs] b/[refs] index 8cdc0ce230da..c90f460160a2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c3aa1bd3768e278512f7583ce5f5fe84f466345d +refs/heads/master: ed78bec4d6873e8971f56557f8ca3bcda38044ea diff --git a/trunk/include/net/ip_vs.h b/trunk/include/net/ip_vs.h index 481f856c650f..34a6fa825167 100644 --- a/trunk/include/net/ip_vs.h +++ b/trunk/include/net/ip_vs.h @@ -836,8 +836,6 @@ struct netns_ipvs { int num_services; /* no of virtual services */ 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; /* Service counters */