diff options
| author | David Teigland <teigland@redhat.com> | 2018-12-03 15:27:37 -0600 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-12-21 10:34:44 +0100 |
| commit | 3acc5044f2a9a1c8e9d1d343ec0f1d0f6162deb9 (patch) | |
| tree | 9ca8cd36b823e8539c14f7fdcca0ca40ad632aba | |
| parent | 28f321538deb44a188468384b041fcdfd9a695a1 (diff) | |
| download | linux-stable-3acc5044f2a9a1c8e9d1d343ec0f1d0f6162deb9.tar.gz linux-stable-3acc5044f2a9a1c8e9d1d343ec0f1d0f6162deb9.tar.bz2 linux-stable-3acc5044f2a9a1c8e9d1d343ec0f1d0f6162deb9.zip | |
dlm: fix invalid cluster name warning
[ 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>
| -rw-r--r-- | fs/dlm/user.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/dlm/user.c b/fs/dlm/user.c index dd2b7416e40a..761d74a84f92 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; @@ -402,7 +403,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) |