lkml.org 
[lkml]   [2019]   [Dec]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 167/243] dlm: fix invalid cluster name warning
    Date
    From: David Teigland <teigland@redhat.com>

    [ Upstream commit 3595c559326d0b660bb088a88e22e0ca630a0e35 ]

    The warning added in commit 3b0e761ba83
    "dlm: print log message when cluster name is not set"

    did not account for the fact that lockspaces created
    from userland do not supply a cluster name, so bogus
    warnings are printed every time a userland lockspace
    is created.

    Signed-off-by: David Teigland <teigland@redhat.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    fs/dlm/user.c | 3 ++-
    1 file changed, 2 insertions(+), 1 deletion(-)

    diff --git a/fs/dlm/user.c b/fs/dlm/user.c
    index 13f29409600bb..3c84c62dadb7b 100644
    --- a/fs/dlm/user.c
    +++ b/fs/dlm/user.c
    @@ -25,6 +25,7 @@
    #include "lvb_table.h"
    #include "user.h"
    #include "ast.h"
    +#include "config.h"

    static const char name_prefix[] = "dlm";
    static const struct file_operations device_fops;
    @@ -404,7 +405,7 @@ static int device_create_lockspace(struct dlm_lspace_params *params)
    if (!capable(CAP_SYS_ADMIN))
    return -EPERM;

    - error = dlm_new_lockspace(params->name, NULL, params->flags,
    + error = dlm_new_lockspace(params->name, dlm_config.ci_cluster_name, params->flags,
    DLM_USER_LVB_LEN, NULL, NULL, NULL,
    &lockspace);
    if (error)
    --
    2.20.1


    \
     
     \ /
      Last update: 2019-12-11 16:23    [W:4.107 / U:0.360 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site