[Devel] [RFC 33/54] kobject_uevent: fix CONFIG_VE=n build

[Eva Kurchatova]

Signed-off-by: Eva Kurchatova <eva.kurchatova at virtuozzo.com>
---
 lib/kobject_uevent.c | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/lib/kobject_uevent.c b/lib/kobject_uevent.c
index 352a2a00b35e..00a0262fa5e4 100644
--- a/lib/kobject_uevent.c
+++ b/lib/kobject_uevent.c
@@ -318,14 +318,14 @@ static int uevent_net_broadcast_untagged(struct kobj_uevent_env *env,
 	mutex_lock(&uevent_sock_mutex);
 	list_for_each_entry(ue_sk, &uevent_sock_list, list) {
 		struct sock *uevent_sock = ue_sk->sk;
-		struct ve_struct *owner_ve;
 
-		if (!netlink_has_listeners(uevent_sock, 1))
-			continue;
-
-		owner_ve = sock_net(uevent_sock)->owner_ve;
+#ifdef CONFIG_VE
+		struct ve_struct *owner_ve = sock_net(uevent_sock)->owner_ve;
 		if (!ve_is_super(owner_ve) && owner_ve != get_exec_env())
 			continue;
+#endif
+		if (!netlink_has_listeners(uevent_sock, 1))
+			continue;
 
 		if (!skb) {
 			retval = -ENOMEM;
@@ -354,11 +354,12 @@ static int uevent_net_broadcast_tagged(struct sock *usk,
 	struct user_namespace *owning_user_ns = sock_net(usk)->user_ns;
 	struct sk_buff *skb = NULL;
 	int ret = 0;
-	struct ve_struct *owner_ve;
 
-	owner_ve = sock_net(usk)->owner_ve;
+#ifdef CONFIG_VE
+	struct ve_struct *owner_ve = sock_net(usk)->owner_ve;
 	if (!ve_is_super(owner_ve) && owner_ve != get_exec_env())
 		return -EINVAL;
+#endif
 
 	skb = alloc_uevent_skb(env, action_string, devpath);
 	if (!skb)
-- 
2.54.0