]> sourceware.org Git - lvm2.git/commitdiff
Revert "cov: check label_read_pvid return value"
authorDavid Teigland <teigland@redhat.com>
Fri, 23 Apr 2021 22:12:24 +0000 (17:12 -0500)
committerDavid Teigland <teigland@redhat.com>
Fri, 23 Apr 2021 22:12:24 +0000 (17:12 -0500)
This reverts commit bf461b99c6d26e550835b77eaffe2204cbc9bed3.

label_read_pvid returns 0 for non-PVs and these callers want
to handle non-PVs.

tools/lvmdevices.c

index c6cb1fcffa8b1a82cdf7a1ad3c893c00adeec9aa..b67db7464e37eb1dc114fc8c6b7eaba8054f6f70 100644 (file)
@@ -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
This page took 0.053123 seconds and 5 git commands to generate.