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

dev-cache: replace inefficient looking for dev

Browse Source 
Use btree loopkup to find dev structure by major:minor.
This could have slow down lvm2 commands significantly with
higher amount of LVs.
This commit is contained in:
Zdenek Kabelac 2021-02-26 00:21:41 +01:00
parent 081e47912e
commit 9dd759c6b1
1 changed files with 2 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
lib/device/dev-cache.c
View File

@ -1549,29 +1549,12 @@ struct device *dev_cache_get(struct cmd_context *cmd, const char *name, struct d
return dev; return dev;
} }
static struct device *_dev_cache_seek_devt(dev_t dev)
{
struct device *d = NULL;
struct dm_hash_node *n = dm_hash_get_first(_cache.names);
while (n) {
d = dm_hash_get_data(_cache.names, n);
if (d->dev == dev)
return d;
n = dm_hash_get_next(_cache.names, n);
}
return NULL;
}
/*
* TODO This is very inefficient. We probably want a hash table indexed by
* major:minor for keys to speed up these lookups.
*/
struct device *dev_cache_get_by_devt(struct cmd_context *cmd, dev_t dev, struct dev_filter *f, int *filtered) struct device *dev_cache_get_by_devt(struct cmd_context *cmd, dev_t dev, struct dev_filter *f, int *filtered)
{ {
char path[PATH_MAX]; char path[PATH_MAX];
const char *sysfs_dir; const char *sysfs_dir;
struct stat info; struct stat info;
struct device *d = _dev_cache_seek_devt(dev); struct device *d = (struct device *) btree_lookup(_cache.devices, (uint32_t) dev);
int ret; int ret;
if (filtered) if (filtered)
@ -1600,7 +1583,7 @@ struct device *dev_cache_get_by_devt(struct cmd_context *cmd, dev_t dev, struct
log_debug_devs("Device num not found in dev_cache repeat dev_cache_scan for %d:%d", log_debug_devs("Device num not found in dev_cache repeat dev_cache_scan for %d:%d",
(int)MAJOR(dev), (int)MINOR(dev)); (int)MAJOR(dev), (int)MINOR(dev));
dev_cache_scan(); dev_cache_scan();
d = _dev_cache_seek_devt(dev); d = (struct device *) btree_lookup(_cache.devices, (uint32_t) dev);
} }
if (!d) if (!d)