Commit 446a04d8 authored by David Teigland's avatar David Teigland Committed by Greg Kroah-Hartman

dlm: fix invalid cluster name warning

[ Upstream commit 3595c559 ]

The warning added in commit 3b0e761b
  "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: default avatarDavid Teigland <teigland@redhat.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent ab9d56da
...@@ -25,6 +25,7 @@ ...@@ -25,6 +25,7 @@
#include "lvb_table.h" #include "lvb_table.h"
#include "user.h" #include "user.h"
#include "ast.h" #include "ast.h"
#include "config.h"
static const char name_prefix[] = "dlm"; static const char name_prefix[] = "dlm";
static const struct file_operations device_fops; static const struct file_operations device_fops;
...@@ -404,7 +405,7 @@ static int device_create_lockspace(struct dlm_lspace_params *params) ...@@ -404,7 +405,7 @@ static int device_create_lockspace(struct dlm_lspace_params *params)
if (!capable(CAP_SYS_ADMIN)) if (!capable(CAP_SYS_ADMIN))
return -EPERM; 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, DLM_USER_LVB_LEN, NULL, NULL, NULL,
&lockspace); &lockspace);
if (error) if (error)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment