lkml.org 
[lkml]   [2020]   [Jan]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4/4] x86/resctrl: Clean up unused function parameter in mkdir path
    Date
    Previous patch ("x86/resctrl: Fix a deadlock due to inaccurate
    active reference of kernfs node") 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 unused function parameter in mkdir_rdt_prepare() and its
    callers rdtgroup_mkdir_mon() and rdtgroup_mkdir_ctrl_mon().

    Signed-off-by: Xiaochen Shen <xiaochen.shen@intel.com>
    Reviewed-by: Reinette Chatre <reinette.chatre@intel.com>
    Reviewed-by: Tony Luck <tony.luck@intel.com>
    ---
    arch/x86/kernel/cpu/resctrl/rdtgroup.c | 16 +++++-----------
    1 file changed, 5 insertions(+), 11 deletions(-)

    diff --git a/arch/x86/kernel/cpu/resctrl/rdtgroup.c b/arch/x86/kernel/cpu/resctrl/rdtgroup.c
    index 2c79fcd83271..8ebef16e10be 100644
    --- a/arch/x86/kernel/cpu/resctrl/rdtgroup.c
    +++ b/arch/x86/kernel/cpu/resctrl/rdtgroup.c
    @@ -2648,7 +2648,6 @@ static int rdtgroup_init_alloc(struct rdtgroup *rdtgrp)
    }

    static int mkdir_rdt_prepare(struct kernfs_node *parent_kn,
    - struct kernfs_node *prgrp_kn,
    const char *name, umode_t mode,
    enum rdt_group_type rtype, struct rdtgroup **r)
    {
    @@ -2758,15 +2757,12 @@ static void mkdir_rdt_prepare_clean(struct rdtgroup *rgrp)
    * to monitor a subset of tasks and cpus in its parent ctrl_mon group.
    */
    static int rdtgroup_mkdir_mon(struct kernfs_node *parent_kn,
    - struct kernfs_node *prgrp_kn,
    - const char *name,
    - umode_t mode)
    + const char *name, umode_t mode)
    {
    struct rdtgroup *rdtgrp, *prgrp;
    int ret;

    - ret = mkdir_rdt_prepare(parent_kn, prgrp_kn, name, mode, RDTMON_GROUP,
    - &rdtgrp);
    + ret = mkdir_rdt_prepare(parent_kn, name, mode, RDTMON_GROUP, &rdtgrp);
    if (ret)
    return ret;

    @@ -2788,7 +2784,6 @@ static int rdtgroup_mkdir_mon(struct kernfs_node *parent_kn,
    * to allocate and monitor resources.
    */
    static int rdtgroup_mkdir_ctrl_mon(struct kernfs_node *parent_kn,
    - struct kernfs_node *prgrp_kn,
    const char *name, umode_t mode)
    {
    struct rdtgroup *rdtgrp;
    @@ -2796,8 +2791,7 @@ static int rdtgroup_mkdir_ctrl_mon(struct kernfs_node *parent_kn,
    u32 closid;
    int ret;

    - ret = mkdir_rdt_prepare(parent_kn, prgrp_kn, name, mode, RDTCTRL_GROUP,
    - &rdtgrp);
    + ret = mkdir_rdt_prepare(parent_kn, name, mode, RDTCTRL_GROUP, &rdtgrp);
    if (ret)
    return ret;

    @@ -2871,14 +2865,14 @@ static int rdtgroup_mkdir(struct kernfs_node *parent_kn, const char *name,
    * subdirectory
    */
    if (rdt_alloc_capable && parent_kn == rdtgroup_default.kn)
    - return rdtgroup_mkdir_ctrl_mon(parent_kn, parent_kn, name, mode);
    + return rdtgroup_mkdir_ctrl_mon(parent_kn, name, mode);

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

    return -EPERM;
    }
    --
    1.8.3.1
    \
     
     \ /
      Last update: 2020-01-08 17:00    [W:3.826 / U:0.016 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site