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

pvck: fix dev filtering

Browse Source 
filters needing io weren't being run because bcache
wasn't set up.  Read the first 4k of the device
before doing filtering or reading ondisk structs to
reduce reads.
This commit is contained in:
David Teigland 2020-10-27 15:42:08 -05:00
parent c96645781c
commit 5a94126e7a
1 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
tools/pvck.c
View File

@ -1039,13 +1039,6 @@ static int _dump_label_and_pv_header(struct cmd_context *cmd, uint64_t labelsect
return 0;
}
/*
* Not invalidating this range can cause an error reading
* a larger range that overlaps this.
*/
if (dev && !dev_invalidate_bytes(dev, lh_offset, 512))
stack;
lh = (struct label_header *)buf;
if (print_fields) {
@ -3040,7 +3033,7 @@ int pvck(struct cmd_context *cmd, int argc, char **argv)
clear_hint_file(cmd);
if (!(dev = dev_cache_get(cmd, pv_name, cmd->filter))) {
if (!(dev = dev_cache_get(cmd, pv_name, NULL))) {
log_error("Cannot use %s: %s.", pv_name, devname_error_reason(pv_name));
return ECMD_FAILED;
}
@ -3049,7 +3042,7 @@ int pvck(struct cmd_context *cmd, int argc, char **argv)
if (arg_is_set(cmd, dump_ARG)) {
pv_name = argv[0];
dev = dev_cache_get(cmd, pv_name, cmd->filter);
dev = dev_cache_get(cmd, pv_name, NULL);
if (!dev)
def = get_devicefile(pv_name);
@ -3071,7 +3064,25 @@ int pvck(struct cmd_context *cmd, int argc, char **argv)
return ECMD_FAILED;
}
label_scan_setup_bcache();
if (dev) {
char buf[4096];
label_scan_setup_bcache();
/*
* This buf is not used, but bcache data is used for subsequent
* reads in the filters and by _read_bytes for other disk structs.
*/
if (!dev_read_bytes(dev, 0, 4096, buf)) {
log_error("Failed to read the first 4096 bytes of device %s.", dev_name(dev));
return ECMD_FAILED;
}
if (!cmd->filter->passes_filter(cmd, cmd->filter, dev, NULL)) {
log_error("Cannot use %s: %s.", pv_name, dev_filtered_reason(dev));
return ECMD_FAILED;
}
}
if ((dump = arg_str_value(cmd, dump_ARG, NULL))) {
cmd->use_hints = 0;