shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2025-03-10 16:58:47 +03:00
Code Releases Activity

lvmlockd: remove unused vg_sysid

Browse Source 
from structs and info dump.
This commit is contained in:
David Teigland 2024-11-01 10:45:34 -05:00
parent fc2e4a7b70
commit 0aa585a29f
3 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
daemons/lvmlockd/lvmlockctl.c
View File

@ -126,12 +126,11 @@ static void format_info_ls(char *line)
char ls_name[MAX_NAME+1] = { 0 }; char ls_name[MAX_NAME+1] = { 0 };
char vg_name[MAX_NAME+1] = { 0 }; char vg_name[MAX_NAME+1] = { 0 };
char vg_uuid[MAX_NAME+1] = { 0 }; char vg_uuid[MAX_NAME+1] = { 0 };
char vg_sysid[MAX_NAME+1] = { 0 };
char lock_args[MAX_ARGS+1] = { 0 }; char lock_args[MAX_ARGS+1] = { 0 };
char lock_type[MAX_NAME+1] = { 0 }; char lock_type[MAX_NAME+1] = { 0 };
(void) sscanf(line, "info=ls ls_name=%s vg_name=%s vg_uuid=%s vg_sysid=%s vg_args=%s lm_type=%s", (void) sscanf(line, "info=ls ls_name=%s vg_name=%s vg_uuid=%s vg_args=%s lm_type=%s",
ls_name, vg_name, vg_uuid, vg_sysid, lock_args, lock_type); ls_name, vg_name, vg_uuid, lock_args, lock_type);
if (!first_ls) if (!first_ls)
printf("\n"); printf("\n");

7
daemons/lvmlockd/lvmlockd-core.c
View File

@ -4659,7 +4659,6 @@ static int print_lockspace(struct lockspace *ls, const char *prefix, int pos, in
"ls_name=%s " "ls_name=%s "
"vg_name=%s " "vg_name=%s "
"vg_uuid=%s " "vg_uuid=%s "
"vg_sysid=%s "
"vg_args=%s " "vg_args=%s "
"lm_type=%s " "lm_type=%s "
"host_id=%llu " "host_id=%llu "
@ -4675,7 +4674,6 @@ static int print_lockspace(struct lockspace *ls, const char *prefix, int pos, in
ls->name, ls->name,
ls->vg_name, ls->vg_name,
ls->vg_uuid, ls->vg_uuid,
ls->vg_sysid[0] ? ls->vg_sysid : ".",
ls->vg_args, ls->vg_args,
lm_str(ls->lm_type), lm_str(ls->lm_type),
(unsigned long long)ls->host_id, (unsigned long long)ls->host_id,
@ -4862,7 +4860,6 @@ static void client_recv_action(struct client *cl)
const char *cl_name; const char *cl_name;
const char *vg_name; const char *vg_name;
const char *vg_uuid; const char *vg_uuid;
const char *vg_sysid;
const char *path; const char *path;
const char *str; const char *str;
struct pvs pvs; struct pvs pvs;
@ -4945,7 +4942,6 @@ static void client_recv_action(struct client *cl)
cl_pid = daemon_request_int(req, "pid", 0); cl_pid = daemon_request_int(req, "pid", 0);
vg_name = daemon_request_str(req, "vg_name", NULL); vg_name = daemon_request_str(req, "vg_name", NULL);
vg_uuid = daemon_request_str(req, "vg_uuid", NULL); vg_uuid = daemon_request_str(req, "vg_uuid", NULL);
vg_sysid = daemon_request_str(req, "vg_sysid", NULL);
str = daemon_request_str(req, "mode", NULL); str = daemon_request_str(req, "mode", NULL);
mode = str_to_mode(str); mode = str_to_mode(str);
str = daemon_request_str(req, "opts", NULL); str = daemon_request_str(req, "opts", NULL);
@ -4996,9 +4992,6 @@ static void client_recv_action(struct client *cl)
if (vg_uuid && strcmp(vg_uuid, "none")) if (vg_uuid && strcmp(vg_uuid, "none"))
memccpy(act->vg_uuid, vg_uuid, 0, 64); memccpy(act->vg_uuid, vg_uuid, 0, 64);
if (vg_sysid && strcmp(vg_sysid, "none"))
dm_strncpy(act->vg_sysid, vg_sysid, sizeof(act->vg_sysid));
str = daemon_request_str(req, "lv_name", NULL); str = daemon_request_str(req, "lv_name", NULL);
if (str && strcmp(str, "none")) if (str && strcmp(str, "none"))
strncpy(act->lv_name, str, MAX_NAME); strncpy(act->lv_name, str, MAX_NAME);

2
daemons/lvmlockd/lvmlockd-internal.h
View File

@ -151,7 +151,6 @@ struct action {
char vg_args[MAX_ARGS+1]; char vg_args[MAX_ARGS+1];
char lv_args[MAX_ARGS+1]; char lv_args[MAX_ARGS+1];
char prev_lv_args[MAX_ARGS+1]; char prev_lv_args[MAX_ARGS+1];
char vg_sysid[MAX_NAME+1];
struct pvs pvs; /* PV list for idm */ struct pvs pvs; /* PV list for idm */
}; };
@ -190,7 +189,6 @@ struct lockspace {
char vg_name[MAX_NAME+1]; char vg_name[MAX_NAME+1];
char vg_uuid[64]; char vg_uuid[64];
char vg_args[MAX_ARGS+1]; /* lock manager specific args */ char vg_args[MAX_ARGS+1]; /* lock manager specific args */
char vg_sysid[MAX_NAME+1];
int8_t lm_type; /* lock manager: LM_DLM, LM_SANLOCK */ int8_t lm_type; /* lock manager: LM_DLM, LM_SANLOCK */
void *lm_data; void *lm_data;
uint64_t host_id; uint64_t host_id;