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

cleanup: simplify condition

Browse Source
This commit is contained in:
Zdenek Kabelac 2021-02-27 21:18:48 +01:00
parent eb3dcc72eb
commit 1042cd9a61
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1563,9 +1563,6 @@ struct device *dev_cache_get_by_devt(struct cmd_context *cmd, dev_t dev, struct
if (filtered) if (filtered)
*filtered = 0; *filtered = 0;
if (d && (d->flags & DEV_REGULAR))
return d;
if (!d) { if (!d) {
sysfs_dir = dm_sysfs_dir(); sysfs_dir = dm_sysfs_dir();
if (sysfs_dir && *sysfs_dir) { if (sysfs_dir && *sysfs_dir) {
@ -1587,10 +1584,10 @@ struct device *dev_cache_get_by_devt(struct cmd_context *cmd, dev_t dev, struct
(int)MAJOR(dev), (int)MINOR(dev)); (int)MAJOR(dev), (int)MINOR(dev));
dev_cache_scan(); dev_cache_scan();
d = (struct device *) btree_lookup(_cache.devices, (uint32_t) dev); d = (struct device *) btree_lookup(_cache.devices, (uint32_t) dev);
}
if (!d) if (!d)
return NULL; return NULL;
}
if (d->flags & DEV_REGULAR) if (d->flags & DEV_REGULAR)
return d; return d;
@ -1611,6 +1608,7 @@ struct device *dev_cache_get_by_devt(struct cmd_context *cmd, dev_t dev, struct
if (filtered) if (filtered)
*filtered = 1; *filtered = 1;
return NULL; return NULL;
} }