From nobody Tue Feb 10 07:41:09 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) client-ip=207.211.31.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1594006960; cv=none; d=zohomail.com; s=zohoarc; b=c0zRzVzBgjOZ2ZQf8UKkVJFAqQflanCfnqP22yUXrVZvi0lVy2hnpHVcligZ/ALw0Up4+MD2uv0NhmQXphjwKW1NXxS3fiMEl8IdC3k1+JC35XQnsl0HRBafc6TI2FFPc7sXWtLfGCPehW1xGzBVwK5K5S1AulXofasXdqFIo1Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594006960; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=xmzSoaCsvPRaX/A6Sffu3wGexeStq8/QHwVeHdniF9w=; b=VZ7ieYn4Mdtn4elCdPcuIm2VP5O87i/v7V0HYAcs9nsmu2txSDP4LI7iJZOEmSc934HsrlWThhuG2B3C/iYPoG8woSWpwqZd6rcKH7zqqki9VKf8ZItkp0inzb7c5YU+9p7mw3QArw2GKM2EbGWH/JoeluLoPmFdqHgnYVM9ki8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by mx.zohomail.com with SMTPS id 1594006960977505.09390513392896; Sun, 5 Jul 2020 20:42:40 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-475-QLdjHn1bOki9l-8OsqgUQw-1; Sun, 05 Jul 2020 23:42:37 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 6F8A28064B0; Mon, 6 Jul 2020 03:42:32 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 525A271678; Mon, 6 Jul 2020 03:42:32 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 255E8180531D; Mon, 6 Jul 2020 03:42:32 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 0663gHbj004794 for ; Sun, 5 Jul 2020 23:42:17 -0400 Received: by smtp.corp.redhat.com (Postfix) id D4B157AC9F; Mon, 6 Jul 2020 03:42:17 +0000 (UTC) Received: from vhost2.laine.org (ovpn-112-194.phx2.redhat.com [10.3.112.194]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8ACC371678 for ; Mon, 6 Jul 2020 03:42:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594006959; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=xmzSoaCsvPRaX/A6Sffu3wGexeStq8/QHwVeHdniF9w=; b=gcAjE7cRrlptk/1ZDAS+XUcfKJF8E+IDUqydiDzrVmET8qgaTWcRDBDrifii7yFG05fuAd YDZIYg6vZVKmt225HXTVywBKq4o+G9CKc0OQEfCE0bK01sVDUaElzfl18lvzJki9eqj23j 7e467tyJQJiuhGzXXAIrYtch9iOnAZ8= X-MC-Unique: QLdjHn1bOki9l-8OsqgUQw-1 From: Laine Stump To: libvir-list@redhat.com Subject: [PATCH 27/32] lxc: eliminate unnecessary labels Date: Sun, 5 Jul 2020 23:41:22 -0400 Message-Id: <20200706034127.1117504-28-laine@redhat.com> In-Reply-To: <20200706034127.1117504-1-laine@redhat.com> References: <20200706034127.1117504-1-laine@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Laine Stump Reviewed-by: J=C3=A1n Tomko --- src/lxc/lxc_controller.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c index 01cdeb29db..ae6b737b60 100644 --- a/src/lxc/lxc_controller.c +++ b/src/lxc/lxc_controller.c @@ -1380,13 +1380,12 @@ virLXCControllerSetupUsernsMap(virDomainIdMapEntryP= tr map, { g_auto(virBuffer) map_value =3D VIR_BUFFER_INITIALIZER; size_t i; - int ret =3D -1; =20 /* The kernel supports up to 340 lines in /proc//{g,u}id_map */ if (num > 340) { virReportError(VIR_ERR_INVALID_ARG, "%s", _("Too many id mappings defined.")); - goto cleanup; + return -1; } =20 for (i =3D 0; i < num; i++) @@ -1397,12 +1396,10 @@ virLXCControllerSetupUsernsMap(virDomainIdMapEntryP= tr map, =20 if (virFileWriteStr(path, virBufferCurrentContent(&map_value), 0) < 0)= { virReportSystemError(errno, _("unable write to %s"), path); - goto cleanup; + return -1; } =20 - ret =3D 0; - cleanup: - return ret; + return 0; } =20 /** --=20 2.25.4