From: Bradley Morgan <include@grrlz.net>
To: bsingharora@gmail.com
Cc: linux-kernel@vger.kernel.org, akpm@linux-foundation.org,
Bradley Morgan <include@grrlz.net>
Subject: [PATCH] taskstats: fold the two pid/tgid handlers into one
Date: Sat, 1 Aug 2026 22:58:44 +0000 [thread overview]
Message-ID: <20260801225845.23855-1-include@grrlz.net> (raw)
cmd_attr_pid() and cmd_attr_tgid() are copy paste. fold them
into one handler that takes the attr type and fill function as
parameters, same pattern as the cpumask fold in 59c0bc949c5e.
No functional change.
Signed-off-by: Bradley Morgan <include@grrlz.net>
---
kernel/taskstats.c | 47 ++++++++++++----------------------------------
1 file changed, 12 insertions(+), 35 deletions(-)
diff --git a/kernel/taskstats.c b/kernel/taskstats.c
index 3ae1755ca1b5..8a816d903c24 100644
--- a/kernel/taskstats.c
+++ b/kernel/taskstats.c
@@ -474,7 +474,8 @@ static size_t taskstats_packet_size(void)
return size;
}
-static int cmd_attr_pid(struct genl_info *info)
+static int cmd_attr_pid_tgid(struct genl_info *info, int attr,
+ int (*fill)(pid_t, struct taskstats *))
{
struct taskstats *stats;
struct sk_buff *rep_skb;
@@ -489,41 +490,15 @@ static int cmd_attr_pid(struct genl_info *info)
return rc;
rc = -EINVAL;
- pid = nla_get_u32(info->attrs[TASKSTATS_CMD_ATTR_PID]);
- stats = mk_reply(rep_skb, TASKSTATS_TYPE_PID, pid);
+ pid = nla_get_u32(info->attrs[attr]);
+ stats = mk_reply(rep_skb,
+ attr == TASKSTATS_CMD_ATTR_PID
+ ? TASKSTATS_TYPE_PID : TASKSTATS_TYPE_TGID,
+ pid);
if (!stats)
goto err;
- rc = fill_stats_for_pid(pid, stats);
- if (rc < 0)
- goto err;
- return send_reply(rep_skb, info);
-err:
- nlmsg_free(rep_skb);
- return rc;
-}
-
-static int cmd_attr_tgid(struct genl_info *info)
-{
- struct taskstats *stats;
- struct sk_buff *rep_skb;
- size_t size;
- u32 tgid;
- int rc;
-
- size = taskstats_packet_size();
-
- rc = prepare_reply(info, TASKSTATS_CMD_NEW, &rep_skb, size);
- if (rc < 0)
- return rc;
-
- rc = -EINVAL;
- tgid = nla_get_u32(info->attrs[TASKSTATS_CMD_ATTR_TGID]);
- stats = mk_reply(rep_skb, TASKSTATS_TYPE_TGID, tgid);
- if (!stats)
- goto err;
-
- rc = fill_stats_for_tgid(tgid, stats);
+ rc = fill(pid, stats);
if (rc < 0)
goto err;
return send_reply(rep_skb, info);
@@ -543,9 +518,11 @@ static int taskstats_user_cmd(struct sk_buff *skb, struct genl_info *info)
TASKSTATS_CMD_ATTR_DEREGISTER_CPUMASK,
DEREGISTER);
else if (info->attrs[TASKSTATS_CMD_ATTR_PID])
- return cmd_attr_pid(info);
+ return cmd_attr_pid_tgid(info, TASKSTATS_CMD_ATTR_PID,
+ fill_stats_for_pid);
else if (info->attrs[TASKSTATS_CMD_ATTR_TGID])
- return cmd_attr_tgid(info);
+ return cmd_attr_pid_tgid(info, TASKSTATS_CMD_ATTR_TGID,
+ fill_stats_for_tgid);
else
return -EINVAL;
}
--
2.47.3
reply other threads:[~2026-08-01 22:58 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260801225845.23855-1-include@grrlz.net \
--to=include@grrlz.net \
--cc=akpm@linux-foundation.org \
--cc=bsingharora@gmail.com \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox