Skip to content

Commit 32ada3b

Browse files
xiaochenshensuryasaimadhu
authored andcommitted
x86/resctrl: Clean up unused function parameter in mkdir path
Commit 334b0f4 ("x86/resctrl: Fix a deadlock due to inaccurate reference") changed the argument to rdtgroup_kn_lock_live()/rdtgroup_kn_unlock() within mkdir_rdt_prepare(). That change resulted in an unused function parameter to mkdir_rdt_prepare(). Clean up the unused function parameter in mkdir_rdt_prepare() and its callers rdtgroup_mkdir_mon() and rdtgroup_mkdir_ctrl_mon(). Signed-off-by: Xiaochen Shen <[email protected]> Signed-off-by: Borislav Petkov <[email protected]> Reviewed-by: Reinette Chatre <[email protected]> Reviewed-by: Tony Luck <[email protected]> Acked-by: Thomas Gleixner <[email protected]> Link: https://lkml.kernel.org/r/[email protected]
1 parent 334b0f4 commit 32ada3b

File tree

1 file changed

+5
-11
lines changed

1 file changed

+5
-11
lines changed

arch/x86/kernel/cpu/resctrl/rdtgroup.c

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2644,7 +2644,6 @@ static int rdtgroup_init_alloc(struct rdtgroup *rdtgrp)
26442644
}
26452645

26462646
static int mkdir_rdt_prepare(struct kernfs_node *parent_kn,
2647-
struct kernfs_node *prgrp_kn,
26482647
const char *name, umode_t mode,
26492648
enum rdt_group_type rtype, struct rdtgroup **r)
26502649
{
@@ -2754,15 +2753,12 @@ static void mkdir_rdt_prepare_clean(struct rdtgroup *rgrp)
27542753
* to monitor a subset of tasks and cpus in its parent ctrl_mon group.
27552754
*/
27562755
static int rdtgroup_mkdir_mon(struct kernfs_node *parent_kn,
2757-
struct kernfs_node *prgrp_kn,
2758-
const char *name,
2759-
umode_t mode)
2756+
const char *name, umode_t mode)
27602757
{
27612758
struct rdtgroup *rdtgrp, *prgrp;
27622759
int ret;
27632760

2764-
ret = mkdir_rdt_prepare(parent_kn, prgrp_kn, name, mode, RDTMON_GROUP,
2765-
&rdtgrp);
2761+
ret = mkdir_rdt_prepare(parent_kn, name, mode, RDTMON_GROUP, &rdtgrp);
27662762
if (ret)
27672763
return ret;
27682764

@@ -2784,16 +2780,14 @@ static int rdtgroup_mkdir_mon(struct kernfs_node *parent_kn,
27842780
* to allocate and monitor resources.
27852781
*/
27862782
static int rdtgroup_mkdir_ctrl_mon(struct kernfs_node *parent_kn,
2787-
struct kernfs_node *prgrp_kn,
27882783
const char *name, umode_t mode)
27892784
{
27902785
struct rdtgroup *rdtgrp;
27912786
struct kernfs_node *kn;
27922787
u32 closid;
27932788
int ret;
27942789

2795-
ret = mkdir_rdt_prepare(parent_kn, prgrp_kn, name, mode, RDTCTRL_GROUP,
2796-
&rdtgrp);
2790+
ret = mkdir_rdt_prepare(parent_kn, name, mode, RDTCTRL_GROUP, &rdtgrp);
27972791
if (ret)
27982792
return ret;
27992793

@@ -2867,14 +2861,14 @@ static int rdtgroup_mkdir(struct kernfs_node *parent_kn, const char *name,
28672861
* subdirectory
28682862
*/
28692863
if (rdt_alloc_capable && parent_kn == rdtgroup_default.kn)
2870-
return rdtgroup_mkdir_ctrl_mon(parent_kn, parent_kn, name, mode);
2864+
return rdtgroup_mkdir_ctrl_mon(parent_kn, name, mode);
28712865

28722866
/*
28732867
* If RDT monitoring is supported and the parent directory is a valid
28742868
* "mon_groups" directory, add a monitoring subdirectory.
28752869
*/
28762870
if (rdt_mon_capable && is_mon_groups(parent_kn, name))
2877-
return rdtgroup_mkdir_mon(parent_kn, parent_kn->parent, name, mode);
2871+
return rdtgroup_mkdir_mon(parent_kn, name, mode);
28782872

28792873
return -EPERM;
28802874
}

0 commit comments

Comments
 (0)