diff options
author | David Teigland <teigland@redhat.com> | 2021-04-23 17:12:24 -0500 |
---|---|---|
committer | David Teigland <teigland@redhat.com> | 2021-04-23 17:12:24 -0500 |
commit | fcbed26393f57d49daa7da73922b1a922f9523a2 (patch) | |
tree | 606bf654865460b5da738cebb25ead635ef18ce1 | |
parent | 9cdd4dcca7e6d166e44270a81425a50e598836f4 (diff) | |
download | lvm2-fcbed26393f57d49daa7da73922b1a922f9523a2.tar.gz |
Revert "cov: check label_read_pvid return value"
This reverts commit bf461b99c6d26e550835b77eaffe2204cbc9bed3.
label_read_pvid returns 0 for non-PVs and these callers want
to handle non-PVs.
-rw-r--r-- | tools/lvmdevices.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/tools/lvmdevices.c b/tools/lvmdevices.c index c6cb1fcff..b67db7464 100644 --- a/tools/lvmdevices.c +++ b/tools/lvmdevices.c @@ -181,8 +181,7 @@ int lvmdevices(struct cmd_context *cmd, int argc, char **argv) continue; dev = du->dev; - if (!label_read_pvid(dev)) - continue; + label_read_pvid(dev); /* * label_read_pvid has read the first 4K of the device @@ -284,8 +283,7 @@ int lvmdevices(struct cmd_context *cmd, int argc, char **argv) * (it's ok if the device is not a PV and has no PVID) */ label_scan_setup_bcache(); - if (!label_read_pvid(dev)) - goto_bad; + label_read_pvid(dev); /* * Allow filtered devices to be added to devices_file, but |