summaryrefslogtreecommitdiff
path: root/tools/lvmdiskscan.c
diff options
context:
space:
mode:
authorDavid Teigland <teigland@redhat.com>2018-06-15 11:03:55 -0500
committerDavid Teigland <teigland@redhat.com>2018-06-15 11:03:55 -0500
commit8eab37593eccbbb8c6d03a9bae2f6852c17a00a5 (patch)
tree1454f1f7fc3f8251a55d749de00ddb388688a25b /tools/lvmdiskscan.c
parent27c647d6ce707326237771d3b046b6049161fb5a (diff)
downloadlvm2-8eab37593eccbbb8c6d03a9bae2f6852c17a00a5.tar.gz
Add cmd arg to more functions
so that it can be used in the filter code
Diffstat (limited to 'tools/lvmdiskscan.c')
-rw-r--r--tools/lvmdiskscan.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/tools/lvmdiskscan.c b/tools/lvmdiskscan.c
index 772694cc2..0b97eba44 100644
--- a/tools/lvmdiskscan.c
+++ b/tools/lvmdiskscan.c
@@ -27,7 +27,7 @@ int pv_disks_found;
int pv_parts_found;
int max_len;
-static int _get_max_dev_name_len(struct dev_filter *filter)
+static int _get_max_dev_name_len(struct cmd_context *cmd, struct dev_filter *filter)
{
int len = 0;
int maxlen = 0;
@@ -40,7 +40,7 @@ static int _get_max_dev_name_len(struct dev_filter *filter)
}
/* Do scan */
- for (dev = dev_iter_get(iter); dev; dev = dev_iter_get(iter)) {
+ for (dev = dev_iter_get(cmd, iter); dev; dev = dev_iter_get(cmd, iter)) {
len = strlen(dev_name(dev));
if (len > maxlen)
maxlen = len;
@@ -100,14 +100,14 @@ int lvmdiskscan(struct cmd_context *cmd, int argc __attribute__((unused)),
/* Call before using dev_iter which uses filters which want bcache data. */
label_scan(cmd);
- max_len = _get_max_dev_name_len(cmd->full_filter);
+ max_len = _get_max_dev_name_len(cmd, cmd->full_filter);
if (!(iter = dev_iter_create(cmd->full_filter, 0))) {
log_error("dev_iter_create failed");
return ECMD_FAILED;
}
- for (dev = dev_iter_get(iter); dev; dev = dev_iter_get(iter)) {
+ for (dev = dev_iter_get(cmd, iter); dev; dev = dev_iter_get(cmd, iter)) {
if (lvmcache_has_dev_info(dev)) {
if (!dev_get_size(dev, &size)) {
log_error("Couldn't get size of \"%s\"",