diff options
author | David Teigland <teigland@redhat.com> | 2018-12-04 00:27:37 +0300 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-12-13 10:52:23 +0300 |
commit | 446a04d879a0ca9fc58195050ea6117d1f9bd22a (patch) | |
tree | 2140c50dde52de2dded157f8383bdd21f0b2c91d /fs | |
parent | ab9d56dace3bdd7ed6957923b85c6cb29f959d68 (diff) | |
download | linux-446a04d879a0ca9fc58195050ea6117d1f9bd22a.tar.xz |
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>
Diffstat (limited to 'fs')
-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 13f29409600b..3c84c62dadb7 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) |