dlm: fix invalid cluster name warning
The warning added in commit 3b0e761ba8
"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>
This commit is contained in:
parent
3456880ff3
commit
3595c55932
|
@ -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)
|
||||||
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)
|
||||||
|
|
Loading…
Reference in New Issue