diff options
| author | David Teigland <teigland@redhat.com> | 2018-12-03 15:27:37 -0600 |
|---|---|---|
| committer | David Teigland <teigland@redhat.com> | 2018-12-03 15:30:24 -0600 |
| commit | 3595c559326d0b660bb088a88e22e0ca630a0e35 (patch) | |
| tree | dd7d2741aaad4ae30162020c53bb232586a5e32c /fs/dlm | |
| parent | 3456880ff39f7606866b5852fd71ef6663200c0d (diff) | |
| download | linux-stable-3595c559326d0b660bb088a88e22e0ca630a0e35.tar.gz linux-stable-3595c559326d0b660bb088a88e22e0ca630a0e35.tar.bz2 linux-stable-3595c559326d0b660bb088a88e22e0ca630a0e35.zip | |
dlm: fix invalid cluster name warning
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>
Diffstat (limited to 'fs/dlm')
| -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) |