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

label: cache dm dev list earlier

Browse Source 
Cache (when possibly with newer kernel) earlier within label
scanning loop, so the cache information can be also used by
hints file.
This commit is contained in:
Zdenek Kabelac 2024-05-24 20:50:46 +02:00
parent dac2bfe6a4
commit d192477ae6
1 changed files with 22 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
lib/label/label.c
View File

@ -1260,6 +1260,7 @@ int label_scan(struct cmd_context *cmd)
uint64_t max_metadata_size_bytes; uint64_t max_metadata_size_bytes;
int using_hints; int using_hints;
int create_hints = 0; /* NEWHINTS_NONE */ int create_hints = 0; /* NEWHINTS_NONE */
unsigned devs_features = 0;
log_debug_devs("Finding devices to scan"); log_debug_devs("Finding devices to scan");
@ -1271,6 +1272,15 @@ int label_scan(struct cmd_context *cmd)
if (!label_scan_setup_bcache()) if (!label_scan_setup_bcache())
return_0; return_0;
/* Initialize device_list cache early so
* 'Hints' file processing can also use it */
dm_device_list_destroy(&cmd->cache_dm_devs);
if (get_device_list(NULL, &cmd->cache_dm_devs, &devs_features))
if (!(devs_features & DM_DEVICE_LIST_HAS_UUID))
/* Using older kernels without UUIDs in LIST,
* -> cannot use cache */
dm_device_list_destroy(&cmd->cache_dm_devs);
/* /*
* Creates a list of available devices, does not open or read any, * Creates a list of available devices, does not open or read any,
* and does not filter them. The list of all available devices * and does not filter them. The list of all available devices
@ -1661,9 +1671,7 @@ void label_scan_invalidate_lv(struct cmd_context *cmd, struct logical_volume *lv
void label_scan_invalidate_lvs(struct cmd_context *cmd, struct dm_list *lvs) void label_scan_invalidate_lvs(struct cmd_context *cmd, struct dm_list *lvs)
{ {
struct dm_list *devs;
struct dm_active_device *dm_dev; struct dm_active_device *dm_dev;
unsigned devs_features = 0;
struct device *dev; struct device *dev;
struct lv_list *lvl; struct lv_list *lvl;
dev_t devt; dev_t devt;
@ -1674,30 +1682,20 @@ void label_scan_invalidate_lvs(struct cmd_context *cmd, struct dm_list *lvs)
*/ */
if (!cmd->scan_lvs) if (!cmd->scan_lvs)
return; return;
log_debug("invalidating devs for any pvs on lvs");
if (get_device_list(NULL, &devs, &devs_features)) { log_debug("Invalidating devs for any PVs on LVs.");
if (devs_features & DM_DEVICE_LIST_HAS_UUID) {
dm_list_iterate_items(dm_dev, devs) if (cmd->cache_dm_devs) {
if (dm_dev->uuid && dm_list_iterate_items(dm_dev, cmd->cache_dm_devs)
strncmp(dm_dev->uuid, UUID_PREFIX, sizeof(UUID_PREFIX) - 1) == 0) { if (dm_dev->uuid &&
devt = MKDEV(dm_dev->major, dm_dev->minor); strncmp(dm_dev->uuid, UUID_PREFIX, sizeof(UUID_PREFIX) - 1) == 0) {
if ((dev = dev_cache_get_by_devt(cmd, devt))) devt = MKDEV(dm_dev->major, dm_dev->minor);
label_scan_invalidate(dev); if ((dev = dev_cache_get_by_devt(cmd, devt)))
} label_scan_invalidate(dev);
/* ATM no further caching for any lvconvert command
* TODO: any other command to be skipped ??
*/
if (strcmp(cmd->name, "lvconvert")) {
dm_device_list_destroy(&cmd->cache_dm_devs);
cmd->cache_dm_devs = devs; /* cache to avoid unneeded checks */
devs = NULL;
} }
} } else
dm_device_list_destroy(&devs); /* With older kernels without UUIDs we have to go the old way
} * and check for every LVs UUID one by one */
if (!(devs_features & DM_DEVICE_LIST_HAS_UUID))
dm_list_iterate_items(lvl, lvs) dm_list_iterate_items(lvl, lvs)
label_scan_invalidate_lv(cmd, lvl->lv); label_scan_invalidate_lv(cmd, lvl->lv);
} }