shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2024-12-21 13:34:40 +03:00
Code Releases Activity

devices: update function name to dm_device_is_usable

Browse Source
This commit is contained in:
David Teigland 2024-06-28 13:56:12 -05:00
parent 990f4f7c4f
commit 24943fe9d3
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/activate/activate.c
View File

@ -418,7 +418,7 @@ int add_areas_line(struct dev_manager *dm, struct lv_segment *seg,
{ {
return 0; 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; return 0;
} }

2
lib/activate/activate.h
View File

@ -264,7 +264,7 @@ struct dev_usable_check_params {
* Returns 1 if mapped device is not suspended, blocked or * Returns 1 if mapped device is not suspended, blocked or
* is using a reserved name. * 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 * Declaration moved here from fs.h to keep header fs.h hidden

16
lib/activate/dev_manager.c
View File

@ -479,12 +479,12 @@ static int _ignore_blocked_mirror_devices(struct cmd_context *cmd,
goto_out; goto_out;
tmp_dev->dev = MKDEV(sm->logs[0].major, sm->logs[0].minor); tmp_dev->dev = MKDEV(sm->logs[0].major, sm->logs[0].minor);
if (device_is_usable(cmd, tmp_dev, (struct dev_usable_check_params) if (dm_device_is_usable(cmd, tmp_dev, (struct dev_usable_check_params)
{ .check_empty = 1, { .check_empty = 1,
.check_blocked = 1, .check_blocked = 1,
.check_suspended = ignore_suspended_devices(), .check_suspended = ignore_suspended_devices(),
.check_error_target = 1, .check_error_target = 1,
.check_reserved = 0 }, NULL)) .check_reserved = 0 }, NULL))
goto out; /* safe to use */ goto out; /* safe to use */
stack; 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 * @dev
* @check_lv_names * @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 * 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_task *dmt;
struct dm_info info; struct dm_info info;

2
lib/filters/filter-usable.c
View File

@ -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 */ /* further checks are done on dm devices only */
if (dm_is_dm_major(MAJOR(dev->dev))) { 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) if (is_lv)
dev->filtered_flags |= DEV_FILTERED_IS_LV; dev->filtered_flags |= DEV_FILTERED_IS_LV;
else else