a7y18lte-ubports/android_kernel_samsung_a7y18lte
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dlm: fix invalid cluster name warning

Browse Source 
[ 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>
This commit is contained in:
David Teigland 2018-12-03 15:27:37 -06:00 committed by prashantpaddune
parent 7a1595bffc
commit 79ab5dd7e8
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
fs/dlm/user.c
View File

@ -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;
@ -402,7 +403,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)