Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3acc5044 authored by David Teigland's avatar David Teigland Committed by Greg Kroah-Hartman
Browse files

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: default avatarDavid Teigland <teigland@redhat.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 28f32153

fs/dlm/user.c

+2 −1
Original line number Diff line number Diff line
@@ -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;
@@ -402,7 +403,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)