diff options
| author | Zdenek Kabelac <zkabelac@redhat.com> | 2021-02-14 17:47:08 +0100 |
|---|---|---|
| committer | Zdenek Kabelac <zkabelac@redhat.com> | 2021-02-17 11:53:19 +0100 |
| commit | 868b733588ff5629e1318bf3efcfbceb2ac8db8c (patch) | |
| tree | 1b89dfe8f8d79f9d3f32ff04f6adaa1cb2458db6 | |
| parent | fbaf5a32bb3465d121f60db5a77df2e86b0bf49b (diff) | |
| download | lvm2-868b733588ff5629e1318bf3efcfbceb2ac8db8c.tar.gz | |
lvmlocdk: correct creation of dm path vg sanlock LV
Vgname may contain '-' and needs escaping '--' for /dev/mapper path.
| -rw-r--r-- | lib/locking/lvmlockd.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/lib/locking/lvmlockd.c b/lib/locking/lvmlockd.c index 24b7ff6f7..3b9abd6bf 100644 --- a/lib/locking/lvmlockd.c +++ b/lib/locking/lvmlockd.c @@ -382,6 +382,7 @@ static int _extend_sanlock_lv(struct cmd_context *cmd, struct volume_group *vg, { struct device *dev; char path[PATH_MAX]; + char *name; uint64_t old_size_bytes; uint64_t new_size_bytes; uint32_t extend_bytes; @@ -423,8 +424,10 @@ static int _extend_sanlock_lv(struct cmd_context *cmd, struct volume_group *vg, new_size_bytes = lv->size * SECTOR_SIZE; - if (dm_snprintf(path, sizeof(path), "%s/mapper/%s-%s", lv->vg->cmd->dev_dir, - lv->vg->name, lv->name) < 0) { + if (!(name = dm_build_dm_name(lv->vg->cmd->mem, lv->vg->name, lv->name, NULL))) + return_0; + + if (dm_snprintf(path, sizeof(path), "%s/%s", dm_dir(), name) < 0) { log_error("Extend sanlock LV %s name too long - extended size not zeroed.", display_lvname(lv)); return 0; |