From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from devianza.investici.org (devianza.investici.org [198.167.222.108]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6EF671F8723 for ; Tue, 28 Jul 2026 20:21:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.167.222.108 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785270078; cv=none; b=GvgkHR75aG8aiDrmchf3BSmaXQrnC2ETczN/4k1Np0Hlz1D2FonRMFAr26A982xdeiYE6+OJN4hWvZjWQI227mdZRxLSwo4E9fd9eAB3wefE3wRsCBapWq2qgGeEbwOrN9XMNjURR5wjoJpr6SwtkqXZS2plfAF/akxNswBDLzE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785270078; c=relaxed/simple; bh=49zmda5H/e68O1epMr1HrnS0TSmHNro1sKqz+iNR4w0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=nsoAbB06k81HaKJW2QCw5G36uBqXeK4qIBrJCld0EMh+UeRZZlpofrylrFuzQeGtFGKiwpK6TOHBs8PBhWFeWzTIkbJ8NQkhKOI1EwGe9y/JEAUolPvQnCvV27aHFS0VZX3pATB3KRWCGZ2gzxJs/+YCYd6v6unSeiJDbYnvKLc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=grrlz.net; spf=pass smtp.mailfrom=grrlz.net; dkim=pass (1024-bit key) header.d=grrlz.net header.i=@grrlz.net header.b=IpoT6aJa; arc=none smtp.client-ip=198.167.222.108 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=grrlz.net Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=grrlz.net Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=grrlz.net header.i=@grrlz.net header.b="IpoT6aJa" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=grrlz.net; s=stigmate; t=1785270067; bh=sF37IT6JxraRoTQccoa7eIQePE4BZ1bwbxzZnNWc4HE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=IpoT6aJaQI4yfZjxdtmkM8RUvcl+EpdSTX9lXT3CNGCnt0btG4RjrSvVSkhEedoF0 a9AJGLaS38g3tEEU4nSf2dxbPxpZVnZ8esMjUHjeVdOD9n/74jmDloFQRkkQvyqEOA XPs6JnWcotSgneuBsQznH9vq3paI6IT4c9YM35Js= Received: from mx2.investici.org (unknown [127.0.0.1]) by devianza.investici.org (Postfix) with ESMTP id 4h8n0g601kz6vMp; Tue, 28 Jul 2026 20:21:07 +0000 (UTC) Received: by mx2.investici.org (Postfix) id 4h8n0g30pTz4y43; Tue, 28 Jul 2026 20:21:07 +0000 (UTC) From: Bradley Morgan To: Balbir Singh , Andrew Morton Cc: linux-kernel@vger.kernel.org, Bradley Morgan Subject: [PATCH 2/2] taskstats: fold the two cpumask handlers into one Date: Tue, 28 Jul 2026 20:21:04 +0000 Message-ID: <20260728202104.17839-3-include@grrlz.net> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260728202104.17839-1-include@grrlz.net> References: <20260728202104.17839-1-include@grrlz.net> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit cmd_attr_register_cpumask() and cmd_attr_deregister_cpumask() differed only in which attribute they parsed and which action they passed on, so take both as arguments. __free(free_cpumask_var) then removes the goto. No functional change. Signed-off-by: Bradley Morgan --- kernel/taskstats.c | 38 ++++++++++++-------------------------- 1 file changed, 12 insertions(+), 26 deletions(-) diff --git a/kernel/taskstats.c b/kernel/taskstats.c index e7f8e1b5d1bc..3ae1755ca1b5 100644 --- a/kernel/taskstats.c +++ b/kernel/taskstats.c @@ -449,36 +449,18 @@ static int cgroupstats_user_cmd(struct sk_buff *skb, struct genl_info *info) return send_reply(rep_skb, info); } -static int cmd_attr_register_cpumask(struct genl_info *info) +static int cmd_attr_cpumask(struct genl_info *info, int attr, + enum actions action) { - cpumask_var_t mask; + cpumask_var_t mask __free(free_cpumask_var) = CPUMASK_VAR_NULL; int rc; if (!alloc_cpumask_var(&mask, GFP_KERNEL)) return -ENOMEM; - rc = parse(info->attrs[TASKSTATS_CMD_ATTR_REGISTER_CPUMASK], mask); + rc = parse(info->attrs[attr], mask); if (rc < 0) - goto out; - rc = add_del_listener(info->snd_portid, mask, REGISTER); -out: - free_cpumask_var(mask); - return rc; -} - -static int cmd_attr_deregister_cpumask(struct genl_info *info) -{ - cpumask_var_t mask; - int rc; - - if (!alloc_cpumask_var(&mask, GFP_KERNEL)) - return -ENOMEM; - rc = parse(info->attrs[TASKSTATS_CMD_ATTR_DEREGISTER_CPUMASK], mask); - if (rc < 0) - goto out; - rc = add_del_listener(info->snd_portid, mask, DEREGISTER); -out: - free_cpumask_var(mask); - return rc; + return rc; + return add_del_listener(info->snd_portid, mask, action); } static size_t taskstats_packet_size(void) @@ -553,9 +535,13 @@ static int cmd_attr_tgid(struct genl_info *info) static int taskstats_user_cmd(struct sk_buff *skb, struct genl_info *info) { if (info->attrs[TASKSTATS_CMD_ATTR_REGISTER_CPUMASK]) - return cmd_attr_register_cpumask(info); + return cmd_attr_cpumask(info, + TASKSTATS_CMD_ATTR_REGISTER_CPUMASK, + REGISTER); else if (info->attrs[TASKSTATS_CMD_ATTR_DEREGISTER_CPUMASK]) - return cmd_attr_deregister_cpumask(info); + return cmd_attr_cpumask(info, + TASKSTATS_CMD_ATTR_DEREGISTER_CPUMASK, + DEREGISTER); else if (info->attrs[TASKSTATS_CMD_ATTR_PID]) return cmd_attr_pid(info); else if (info->attrs[TASKSTATS_CMD_ATTR_TGID]) -- 2.47.3