lvmlockd: remove unused vg_sysid

from structs and info dump.

diff --git a/daemons/lvmlockd/lvmlockctl.c b/daemons/lvmlockd/lvmlockctl.c
index 28dbdd145474a396c5ed7a099824f1069565620d..cf50f23c1fce0cf94adc26db1913714fa25f4ed2 100644 (file)
--- a/daemons/lvmlockd/lvmlockctl.c
+++ b/daemons/lvmlockd/lvmlockctl.c
@@ -126,12 +126,11 @@ static void format_info_ls(char *line)
        char ls_name[MAX_NAME+1] = { 0 };
        char vg_name[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_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",
-              ls_name, vg_name, vg_uuid, vg_sysid, lock_args, lock_type);
+       (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, lock_args, lock_type);
 
        if (!first_ls)
                printf("\n");

diff --git a/daemons/lvmlockd/lvmlockd-core.c b/daemons/lvmlockd/lvmlockd-core.c
index 699179f39c8d0fda29c30a78b4535ce29701455e..c486fa34921f7f31c0096345c3590d77650f17a5 100644 (file)
--- a/daemons/lvmlockd/lvmlockd-core.c
+++ b/daemons/lvmlockd/lvmlockd-core.c
@@ -4659,7 +4659,6 @@ static int print_lockspace(struct lockspace *ls, const char *prefix, int pos, in
                        "ls_name=%s "
                        "vg_name=%s "
                        "vg_uuid=%s "
-                       "vg_sysid=%s "
                        "vg_args=%s "
                        "lm_type=%s "
                        "host_id=%llu "
@@ -4675,7 +4674,6 @@ static int print_lockspace(struct lockspace *ls, const char *prefix, int pos, in
                        ls->name,
                        ls->vg_name,
                        ls->vg_uuid,
-                       ls->vg_sysid[0] ? ls->vg_sysid : ".",
                        ls->vg_args,
                        lm_str(ls->lm_type),
                        (unsigned long long)ls->host_id,
@@ -4862,7 +4860,6 @@ static void client_recv_action(struct client *cl)
        const char *cl_name;
        const char *vg_name;
        const char *vg_uuid;
-       const char *vg_sysid;
        const char *path;
        const char *str;
        struct pvs pvs;
@@ -4945,7 +4942,6 @@ static void client_recv_action(struct client *cl)
        cl_pid = daemon_request_int(req, "pid", 0);
        vg_name = daemon_request_str(req, "vg_name", 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);
        mode = str_to_mode(str);
        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"))
                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);
        if (str && strcmp(str, "none"))
                strncpy(act->lv_name, str, MAX_NAME);

diff --git a/daemons/lvmlockd/lvmlockd-internal.h b/daemons/lvmlockd/lvmlockd-internal.h
index eb0d4415a11e2416d12b56b9d181676c007b6b5a..8bbed82f32af391557a90a87e8d4158356a982bf 100644 (file)
--- a/daemons/lvmlockd/lvmlockd-internal.h
+++ b/daemons/lvmlockd/lvmlockd-internal.h
@@ -151,7 +151,6 @@ struct action {
        char vg_args[MAX_ARGS+1];
        char 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 */
 };
 
@@ -190,7 +189,6 @@ struct lockspace {
        char vg_name[MAX_NAME+1];
        char vg_uuid[64];
        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 */
        void *lm_data;
        uint64_t host_id;