From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0411CC433EF for ; Tue, 7 Jun 2022 10:53:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242089AbiFGKxU (ORCPT ); Tue, 7 Jun 2022 06:53:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55360 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242355AbiFGKuN (ORCPT ); Tue, 7 Jun 2022 06:50:13 -0400 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.220.28]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4C6BA98082; Tue, 7 Jun 2022 03:49:58 -0700 (PDT) Received: from relay2.suse.de (relay2.suse.de [149.44.160.134]) by smtp-out1.suse.de (Postfix) with ESMTP id 8DE4321B90; Tue, 7 Jun 2022 10:49:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1654598996; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=AXypnZ6WiOHqzvp/v6LGuwBn5wjho0Mmkh86mIUkjHw=; b=iymZZzRT6ektOXS6WmPFqBb2sWExFC9jHmUcqZRXg9dlHyNEemUrI317Fyu9VdrV/BgJsB 2RCEmenLDX7I7PVaXM88T45QeTQohw330Du92NZ31lHtMp/hv8acoATYCP7oLDjfd1RSd6 HGSWULbzEDacRZpteIWHai/rUpgcx/I= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1654598996; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=AXypnZ6WiOHqzvp/v6LGuwBn5wjho0Mmkh86mIUkjHw=; b=ZwpZvrTWbfmaG8uoQTsM4on+nmTg+UJVYBHEJ7DTnsOhJSkzh358FJSJSUtrDFLukLDj9G gzNwyWLyyDD/XkBA== Received: from localhost.localdomain (unknown [10.100.201.122]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by relay2.suse.de (Postfix) with ESMTPS id 65C092C141; Tue, 7 Jun 2022 10:49:56 +0000 (UTC) From: Jiri Slaby To: gregkh@linuxfoundation.org Cc: linux-serial@vger.kernel.org, linux-kernel@vger.kernel.org, Jiri Slaby Subject: [PATCH 34/36] tty/vt: consolemap: extract con_allocate_new() from con_do_clear_unimap() Date: Tue, 7 Jun 2022 12:49:44 +0200 Message-Id: <20220607104946.18710-34-jslaby@suse.cz> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220607104946.18710-1-jslaby@suse.cz> References: <20220607104946.18710-1-jslaby@suse.cz> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The first part of con_do_clear_unimap() is needed on another place, so extract it to a separate function called con_allocate_new(). It will be used once more in the next patch. Signed-off-by: Jiri Slaby --- drivers/tty/vt/consolemap.c | 38 ++++++++++++++++++++++--------------- 1 file changed, 23 insertions(+), 15 deletions(-) diff --git a/drivers/tty/vt/consolemap.c b/drivers/tty/vt/consolemap.c index 4d8efe74315c..14d3fbff015c 100644 --- a/drivers/tty/vt/consolemap.c +++ b/drivers/tty/vt/consolemap.c @@ -530,27 +530,35 @@ con_insert_unipair(struct uni_pagedict *p, u_short unicode, u_short fontpos) return 0; } +static int con_allocate_new(struct vc_data *vc) +{ + struct uni_pagedict *new, *old = *vc->vc_uni_pagedir_loc; + + new = kzalloc(sizeof(*new), GFP_KERNEL); + if (!new) + return -ENOMEM; + + new->refcount = 1; + *vc->vc_uni_pagedir_loc = new; + + if (old) + old->refcount--; + + return 0; +} + /* Caller must hold the lock */ static int con_do_clear_unimap(struct vc_data *vc) { struct uni_pagedict *old = *vc->vc_uni_pagedir_loc; - if (!old || old->refcount > 1) { - struct uni_pagedict *new = kzalloc(sizeof(*new), GFP_KERNEL); - if (!new) - return -ENOMEM; - - new->refcount = 1; - *vc->vc_uni_pagedir_loc = new; + if (!old || old->refcount > 1) + return con_allocate_new(vc); - if (old) - old->refcount--; - } else { - if (old == dflt) - dflt = NULL; - old->sum = 0; - con_release_unimap(old); - } + if (old == dflt) + dflt = NULL; + old->sum = 0; + con_release_unimap(old); return 0; } -- 2.36.1