From 63c4f92fcca3f077de1d9d1a99a690f5ea381e58 Mon Sep 17 00:00:00 2001 From: Jiri Slaby Date: Tue, 7 Jun 2022 12:49:44 +0200 Subject: [PATCH] tty/vt: consolemap: extract con_allocate_new() from con_do_clear_unimap() 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 Link: https://lore.kernel.org/r/20220607104946.18710-34-jslaby@suse.cz Signed-off-by: Greg Kroah-Hartman --- 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 4d8efe74315c2..14d3fbff015ce 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.30.2