diff --git a/lib/activate/activate.c b/lib/activate/activate.c index 0c7a49a2c..3844992f8 100644 --- a/lib/activate/activate.c +++ b/lib/activate/activate.c @@ -418,7 +418,7 @@ int add_areas_line(struct dev_manager *dm, struct lv_segment *seg, { return 0; } -int device_is_usable(struct cmd_context *cmd, struct device *dev, struct dev_usable_check_params check, int *is_lv) +int dm_device_is_usable(struct cmd_context *cmd, struct device *dev, struct dev_usable_check_params check, int *is_lv) { return 0; } diff --git a/lib/activate/activate.h b/lib/activate/activate.h index b9798ed48..bd30e2655 100644 --- a/lib/activate/activate.h +++ b/lib/activate/activate.h @@ -264,7 +264,7 @@ struct dev_usable_check_params { * Returns 1 if mapped device is not suspended, blocked or * is using a reserved name. */ -int device_is_usable(struct cmd_context *cmd, struct device *dev, struct dev_usable_check_params check, int *is_lv); +int dm_device_is_usable(struct cmd_context *cmd, struct device *dev, struct dev_usable_check_params check, int *is_lv); /* * Declaration moved here from fs.h to keep header fs.h hidden diff --git a/lib/activate/dev_manager.c b/lib/activate/dev_manager.c index 745fa262d..c7f0ec086 100644 --- a/lib/activate/dev_manager.c +++ b/lib/activate/dev_manager.c @@ -479,12 +479,12 @@ static int _ignore_blocked_mirror_devices(struct cmd_context *cmd, goto_out; tmp_dev->dev = MKDEV(sm->logs[0].major, sm->logs[0].minor); - if (device_is_usable(cmd, tmp_dev, (struct dev_usable_check_params) - { .check_empty = 1, - .check_blocked = 1, - .check_suspended = ignore_suspended_devices(), - .check_error_target = 1, - .check_reserved = 0 }, NULL)) + if (dm_device_is_usable(cmd, tmp_dev, (struct dev_usable_check_params) + { .check_empty = 1, + .check_blocked = 1, + .check_suspended = ignore_suspended_devices(), + .check_error_target = 1, + .check_reserved = 0 }, NULL)) goto out; /* safe to use */ stack; } @@ -738,7 +738,7 @@ static int _is_usable_uuid(const struct device *dev, const char *name, const cha } /* - * device_is_usable + * dm_device_is_usable * @dev * @check_lv_names * @@ -753,7 +753,7 @@ static int _is_usable_uuid(const struct device *dev, const char *name, const cha * * Returns: 1 if usable, 0 otherwise */ -int device_is_usable(struct cmd_context *cmd, struct device *dev, struct dev_usable_check_params check, int *is_lv) +int dm_device_is_usable(struct cmd_context *cmd, struct device *dev, struct dev_usable_check_params check, int *is_lv) { struct dm_task *dmt; struct dm_info info; diff --git a/lib/filters/filter-usable.c b/lib/filters/filter-usable.c index dcf9b9091..127a7333b 100644 --- a/lib/filters/filter-usable.c +++ b/lib/filters/filter-usable.c @@ -52,7 +52,7 @@ static int _passes_usable_filter(struct cmd_context *cmd, struct dev_filter *f, /* further checks are done on dm devices only */ if (dm_is_dm_major(MAJOR(dev->dev))) { - if (!(r = device_is_usable(cmd, dev, *ucp, &is_lv))) { + if (!(r = dm_device_is_usable(cmd, dev, *ucp, &is_lv))) { if (is_lv) dev->filtered_flags |= DEV_FILTERED_IS_LV; else