diff options
| author | David Teigland <teigland@redhat.com> | 2018-02-14 16:43:26 -0600 |
|---|---|---|
| committer | David Teigland <teigland@redhat.com> | 2018-04-20 11:22:46 -0500 |
| commit | 96a61337b00a250f69e7a8e6ac390c47c36c2c0f (patch) | |
| tree | c2f087054e60716ebd0cc57d41e7d68094af8607 /tools/lvmdiskscan.c | |
| parent | 28255e3eeef13a0e73a40d533623b22dd9db89cb (diff) | |
| download | lvm2-96a61337b00a250f69e7a8e6ac390c47c36c2c0f.tar.gz | |
lvmdiskscan: use the new label_scan
instead of doing it's own.
Diffstat (limited to 'tools/lvmdiskscan.c')
| -rw-r--r-- | tools/lvmdiskscan.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/tools/lvmdiskscan.c b/tools/lvmdiskscan.c index cb688b5ca..7e2fc8878 100644 --- a/tools/lvmdiskscan.c +++ b/tools/lvmdiskscan.c @@ -87,7 +87,6 @@ int lvmdiskscan(struct cmd_context *cmd, int argc __attribute__((unused)), uint64_t size; struct dev_iter *iter; struct device *dev; - struct label *label; /* initialise these here to avoid problems with the lvm shell */ disks_found = 0; @@ -105,10 +104,10 @@ int lvmdiskscan(struct cmd_context *cmd, int argc __attribute__((unused)), return ECMD_FAILED; } - /* Do scan */ + label_scan(cmd); + for (dev = dev_iter_get(iter); dev; dev = dev_iter_get(iter)) { - /* Try if it is a PV first */ - if ((label_read(dev, &label, UINT64_C(0)))) { + if (lvmcache_has_dev_info(dev)) { if (!dev_get_size(dev, &size)) { log_error("Couldn't get size of \"%s\"", dev_name(dev)); |