shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2025-01-02 01:18:26 +03:00
Code Releases Activity

fix lvmcache_add log_debug pvid

Browse Source 
from previous cleanup
This commit is contained in:
David Teigland 2021-10-13 16:26:00 -05:00
parent 6fb497ef42
commit e88163ceac
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/cache/lvmcache.c vendored
View File

@ -2168,15 +2168,17 @@ struct lvmcache_info *lvmcache_add(struct cmd_context *cmd, struct labeller *lab
{ {
const char *pvid = pvid_arg; const char *pvid = pvid_arg;
const char *vgid = vgid_arg; const char *vgid = vgid_arg;
char pvid_dashed[64] __attribute__((aligned(8)));
struct lvmcache_vgsummary vgsummary = { 0 }; struct lvmcache_vgsummary vgsummary = { 0 };
struct lvmcache_info *info; struct lvmcache_info *info;
struct lvmcache_info *info_lookup; struct lvmcache_info *info_lookup;
struct device_list *devl; struct device_list *devl;
int created = 0; int created = 0;
if (!id_write_format((const struct id *)&pvid, pvid_dashed, sizeof(pvid_dashed))) /*
stack; * Note: ensure that callers of lvmcache_add() pass null terminated
* pvid and vgid strings, and do not pass char* that is type cast
* from struct id.
*/
log_debug_cache("Found PVID %s on %s", pvid, dev_name(dev)); log_debug_cache("Found PVID %s on %s", pvid, dev_name(dev));
@ -2206,7 +2208,7 @@ struct lvmcache_info *lvmcache_add(struct cmd_context *cmd, struct labeller *lab
if (!created) { if (!created) {
if (info->dev != dev) { if (info->dev != dev) {
log_debug_cache("Saving initial duplicate device %s previously seen on %s with PVID %s.", log_debug_cache("Saving initial duplicate device %s previously seen on %s with PVID %s.",
dev_name(dev), dev_name(info->dev), pvid_dashed); dev_name(dev), dev_name(info->dev), pvid);
memset(&dev->pvid, 0, sizeof(dev->pvid)); memset(&dev->pvid, 0, sizeof(dev->pvid));
memcpy(dev->pvid, pvid, ID_LEN); memcpy(dev->pvid, pvid, ID_LEN);