diff options
author | David Teigland <teigland@redhat.com> | 2019-04-11 10:32:28 -0500 |
---|---|---|
committer | David Teigland <teigland@redhat.com> | 2019-04-11 10:32:28 -0500 |
commit | 0cc80ccfd5215073f0f0b0aa3c2913076ae01751 (patch) | |
tree | efa636147391beebd92e491a26fc91fe307073ab | |
parent | 25f231cf06c3938838a64f5b88834d831f45c1c2 (diff) | |
download | lvm2-0cc80ccfd5215073f0f0b0aa3c2913076ae01751.tar.gz |
hints: fix case of error getting device size
When checking hints, if there's an error getting
the device size, that should be equivalent to
seeing zero size.
-rw-r--r-- | lib/label/hints.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/label/hints.c b/lib/label/hints.c index a2e76468a..eb0e725e9 100644 --- a/lib/label/hints.c +++ b/lib/label/hints.c @@ -414,7 +414,7 @@ static int _dev_in_hint_hash(struct cmd_context *cmd, struct device *dev) if (!cmd->scan_lvs && dm_is_dm_major(MAJOR(dev->dev)) && dev_is_lv(dev)) return 0; - if (dev_get_size(dev, &devsize) && !devsize) + if (!dev_get_size(dev, &devsize) || !devsize) return 0; return 1; @@ -604,6 +604,8 @@ static int _read_hint_file(struct cmd_context *cmd, struct dm_list *hints, int * if (!(fp = fopen(_hints_file, "r"))) return 0; + log_debug("Reading hint file"); + for (i = 0; i < HINT_LINE_WORDS; i++) split[i] = NULL; |