shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2025-01-14 23:24:55 +03:00
Code Releases Activity

lvmcache: rename label_read label_scan_dev

Browse Source 
for consistent naming with other similar functions
This commit is contained in:
David Teigland 2020-10-15 12:56:36 -05:00
parent b3cdf0d881
commit c7311d4722
4 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/cache/lvmcache.c vendored
View File

@ -1116,7 +1116,7 @@ int lvmcache_label_scan(struct cmd_context *cmd)
dm_list_iterate_items(devl, &add_cache_devs) {
log_debug_cache("Adding chosen duplicate %s", dev_name(devl->dev));
label_read(devl->dev);
label_scan_dev(devl->dev);
}
dm_list_splice(&_unused_duplicates, &del_cache_devs);

2
lib/label/label.c
View File

@ -1394,7 +1394,7 @@ void label_scan_destroy(struct cmd_context *cmd)
* device, this is not a commonly used function.
*/
int label_read(struct device *dev)
int label_scan_dev(struct device *dev)
{
struct dm_list one_dev;
struct device_list *devl;

3
lib/label/label.h
View File

@ -106,12 +106,11 @@ int label_scan(struct cmd_context *cmd);
int label_scan_devs(struct cmd_context *cmd, struct dev_filter *f, struct dm_list *devs);
int label_scan_devs_rw(struct cmd_context *cmd, struct dev_filter *f, struct dm_list *devs);
int label_scan_devs_excl(struct dm_list *devs);
int label_scan_dev(struct device *dev);
void label_scan_invalidate(struct device *dev);
void label_scan_invalidate_lv(struct cmd_context *cmd, struct logical_volume *lv);
void label_scan_drop(struct cmd_context *cmd);
void label_scan_destroy(struct cmd_context *cmd);
int label_read(struct device *dev);
int label_read_sector(struct device *dev, uint64_t scan_sector);
void label_scan_confirm(struct device *dev);
int label_scan_setup_bcache(void);
int label_scan_open(struct device *dev);

4
tools/toollib.c
View File

@ -1451,7 +1451,7 @@ int process_each_label(struct cmd_context *cmd, int argc, char **argv,
/*
* add info to lvmcache from the duplicate dev.
*/
label_read(devl->dev);
label_scan_dev(devl->dev);
/*
* the info/label should now be found because
@ -4892,7 +4892,7 @@ static int _pvcreate_check_used(struct cmd_context *cmd,
* If a VG is using the dev, it adds basic VG info for it to
* lvmcache.
*/
label_read(pd->dev);
label_scan_dev(pd->dev);
if (!pd->dev->pvid[0]) {
log_debug("Check pvcreate arg %s no PVID found", dev_name(pd->dev));