diff options
| author | Petr Rockai <prockai@redhat.com> | 2012-02-10 01:28:27 +0000 |
|---|---|---|
| committer | Petr Rockai <prockai@redhat.com> | 2012-02-10 01:28:27 +0000 |
| commit | 8e5f7cf3dc1d75d0a370729326522bcac29b489d (patch) | |
| tree | a8e7130afabb199942ac06ac6298b13ce4988266 /lib/label/label.c | |
| parent | 5fa417a9c0aa2d7ea80e1087e0d2943536fc5b9d (diff) | |
| download | lvm2-8e5f7cf3dc1d75d0a370729326522bcac29b489d.tar.gz lvm2-8e5f7cf3dc1d75d0a370729326522bcac29b489d.tar.xz lvm2-8e5f7cf3dc1d75d0a370729326522bcac29b489d.zip | |
Move lvmcache data structures behind an API (making the structures private to
lvmcache.c). No functional change.
Diffstat (limited to 'lib/label/label.c')
| -rw-r--r-- | lib/label/label.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/lib/label/label.c b/lib/label/label.c index f377367e..c38ea16e 100644 --- a/lib/label/label.c +++ b/lib/label/label.c @@ -172,9 +172,9 @@ static struct labeller *_find_labeller(struct device *dev, char *buf, out: if (!found) { - if ((info = info_from_pvid(dev->pvid, 0))) - lvmcache_update_vgname_and_id(info, info->fmt->orphan_vg_name, - info->fmt->orphan_vg_name, + if ((info = lvmcache_info_from_pvid(dev->pvid, 0))) + lvmcache_update_vgname_and_id(info, lvmcache_fmt(info)->orphan_vg_name, + lvmcache_fmt(info)->orphan_vg_name, 0, NULL); log_very_verbose("%s: No label detected", dev_name(dev)); } @@ -261,18 +261,18 @@ int label_read(struct device *dev, struct label **result, struct lvmcache_info *info; int r = 0; - if ((info = info_from_pvid(dev->pvid, 1))) { + if ((info = lvmcache_info_from_pvid(dev->pvid, 1))) { log_debug("Using cached label for %s", dev_name(dev)); - *result = info->label; + *result = lvmcache_get_label(info); /* leaked */ return 1; } if (!dev_open_readonly(dev)) { stack; - if ((info = info_from_pvid(dev->pvid, 0))) - lvmcache_update_vgname_and_id(info, info->fmt->orphan_vg_name, - info->fmt->orphan_vg_name, + if ((info = lvmcache_info_from_pvid(dev->pvid, 0))) + lvmcache_update_vgname_and_id(info, lvmcache_fmt(info)->orphan_vg_name, + lvmcache_fmt(info)->orphan_vg_name, 0, NULL); return r; @@ -348,9 +348,9 @@ int label_verify(struct device *dev) int r = 0; if (!dev_open_readonly(dev)) { - if ((info = info_from_pvid(dev->pvid, 0))) - lvmcache_update_vgname_and_id(info, info->fmt->orphan_vg_name, - info->fmt->orphan_vg_name, + if ((info = lvmcache_info_from_pvid(dev->pvid, 0))) + lvmcache_update_vgname_and_id(info, lvmcache_fmt(info)->orphan_vg_name, + lvmcache_fmt(info)->orphan_vg_name, 0, NULL); return_0; |