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: use dev iterator directly

Browse Source 
Avoid preparing 'extra' dm_list with devices, and just
use the iterator result directly.
This commit is contained in:
Zdenek Kabelac 2024-06-19 14:19:52 +02:00
parent a7e56eb2b6
commit fc24c087e9
1 changed files with 7 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
lib/label/label.c
View File

@ -875,7 +875,6 @@ int label_scan_for_pvid(struct cmd_context *cmd, char *pvid, struct device **dev
char buf[LABEL_SIZE] __attribute__((aligned(8))); char buf[LABEL_SIZE] __attribute__((aligned(8)));
struct dm_list devs; struct dm_list devs;
struct dev_iter *iter; struct dev_iter *iter;
struct device_list *devl, *devl2;
struct device *dev; struct device *dev;
struct pv_header *pvh; struct pv_header *pvh;
int ret = 0; int ret = 0;
@ -891,6 +890,9 @@ int label_scan_for_pvid(struct cmd_context *cmd, char *pvid, struct device **dev
return 0; return 0;
} }
if (!label_scan_setup_bcache())
return_0;
/* /*
* Iterating over all available devices with cmd->filter filters * Iterating over all available devices with cmd->filter filters
* devices; those returned from dev_iter_get are the devs that * devices; those returned from dev_iter_get are the devs that
@ -902,23 +904,10 @@ int label_scan_for_pvid(struct cmd_context *cmd, char *pvid, struct device **dev
return 0; return 0;
} }
log_debug_devs("Filtering devices to scan");
while ((dev = dev_iter_get(cmd, iter))) {
if (!(devl = zalloc(sizeof(*devl))))
continue;
devl->dev = dev;
dm_list_add(&devs, &devl->list);
};
dev_iter_destroy(iter);
if (!label_scan_setup_bcache())
goto_out;
log_debug_devs("Reading labels for pvid"); log_debug_devs("Reading labels for pvid");
dm_list_iterate_items(devl, &devs) { while ((dev = dev_iter_get(cmd, iter))) {
dev = devl->dev;
memset(buf, 0, sizeof(buf)); memset(buf, 0, sizeof(buf));
@ -933,7 +922,7 @@ int label_scan_for_pvid(struct cmd_context *cmd, char *pvid, struct device **dev
pvh = (struct pv_header *)(buf + 32); pvh = (struct pv_header *)(buf + 32);
if (!memcmp(pvh->pv_uuid, pvid, ID_LEN)) { if (!memcmp(pvh->pv_uuid, pvid, ID_LEN)) {
*dev_out = devl->dev; *dev_out = dev;
_scan_dev_close(dev); _scan_dev_close(dev);
break; break;
} }
@ -942,10 +931,8 @@ int label_scan_for_pvid(struct cmd_context *cmd, char *pvid, struct device **dev
} }
ret = 1; ret = 1;
out: out:
dm_list_iterate_items_safe(devl, devl2, &devs) { dev_iter_destroy(iter);
dm_list_del(&devl->list);
free(devl);
}
return ret; return ret;
} }