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

gcc: avoid name colision with function pv_id() from metadata.h

Browse Source
This commit is contained in:
Zdenek Kabelac 2021-09-20 16:12:10 +02:00
parent 2e990d1fec
commit 133686ebc7
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/cache/lvmcache.c vendored
View File

@ -477,14 +477,14 @@ struct lvmcache_info *lvmcache_info_from_pvid(const char *pvid_arg, struct devic
return info; return info;
} }
struct lvmcache_info *lvmcache_info_from_pv_id(const struct id *pv_id, struct device *dev, int valid_only) struct lvmcache_info *lvmcache_info_from_pv_id(const struct id *pvid, struct device *dev, int valid_only)
{ {
/* /*
* Since we know that lvmcache_info_from_pvid directly above * Since we know that lvmcache_info_from_pvid directly above
* does not assume pvid_arg is null-terminated, we make an * does not assume pvid_arg is null-terminated, we make an
* exception here and cast a struct id to char *. * exception here and cast a struct id to char *.
*/ */
return lvmcache_info_from_pvid((const char *)pv_id, dev, valid_only); return lvmcache_info_from_pvid((const char *)pvid, dev, valid_only);
} }
const struct format_type *lvmcache_fmt_from_info(struct lvmcache_info *info) const struct format_type *lvmcache_fmt_from_info(struct lvmcache_info *info)
@ -1391,11 +1391,11 @@ int lvmcache_get_vgnameids(struct cmd_context *cmd,
return 1; return 1;
} }
struct device *lvmcache_device_from_pv_id(struct cmd_context *cmd, const struct id *pv_id, uint64_t *label_sector) struct device *lvmcache_device_from_pv_id(struct cmd_context *cmd, const struct id *pvid, uint64_t *label_sector)
{ {
struct lvmcache_info *info; struct lvmcache_info *info;
if ((info = lvmcache_info_from_pv_id(pv_id, NULL, 0))) { if ((info = lvmcache_info_from_pv_id(pvid, NULL, 0))) {
if (info->label && label_sector) if (info->label && label_sector)
*label_sector = info->label->sector; *label_sector = info->label->sector;
return info->dev; return info->dev;