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

Remove unnecessary full_scan parameter from get_vgids and get_vgnames calls.

Browse Source
This commit is contained in:
Alasdair Kergon 2010-03-16 16:57:03 +00:00
parent 11c289c27a
commit 38220f9fe9
8 changed files with 28 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
WHATS_NEW
View File

@ -1,5 +1,6 @@
Version 2.02.63 -
================================
Remove unnecessary full_scan parameter from get_vgids and get_vgnames calls.
Look up missing PVs by uuid not dev_name in _pvs_single to avoid invalid stat.
Make find_pv_in_vg_by_uuid() return same type as related functions.
Introduce is_missing_pv().

12
lib/cache/lvmcache.c vendored
View File

@ -623,13 +623,13 @@ struct volume_group *lvmcache_get_vg(const char *vgid, unsigned precommitted)
return vg;
}
struct dm_list *lvmcache_get_vgids(struct cmd_context *cmd, int full_scan,
int include_internal)
struct dm_list *lvmcache_get_vgids(struct cmd_context *cmd,
int include_internal)
{
struct dm_list *vgids;
struct lvmcache_vginfo *vginfo;
lvmcache_label_scan(cmd, full_scan);
lvmcache_label_scan(cmd, 0);
if (!(vgids = str_list_create(cmd->mem))) {
log_error("vgids list allocation failed");
@ -650,13 +650,13 @@ struct dm_list *lvmcache_get_vgids(struct cmd_context *cmd, int full_scan,
return vgids;
}
struct dm_list *lvmcache_get_vgnames(struct cmd_context *cmd, int full_scan,
int include_internal)
struct dm_list *lvmcache_get_vgnames(struct cmd_context *cmd,
int include_internal)
{
struct dm_list *vgnames;
struct lvmcache_vginfo *vginfo;
lvmcache_label_scan(cmd, full_scan);
lvmcache_label_scan(cmd, 0);
if (!(vgnames = str_list_create(cmd->mem))) {
log_errno(ENOMEM, "vgnames list allocation failed");

14
lib/cache/lvmcache.h vendored
View File

@ -98,16 +98,14 @@ int vgs_locked(void);
int vgname_is_locked(const char *vgname);
/* Returns list of struct str_lists containing pool-allocated copy of vgnames */
/* Set full_scan to 1 to reread every filtered device label. If include_internal
* is not set, return only proper vg names. */
struct dm_list *lvmcache_get_vgnames(struct cmd_context *cmd, int full_scan,
int include_internal);
/* If include_internal is not set, return only proper vg names. */
struct dm_list *lvmcache_get_vgnames(struct cmd_context *cmd,
int include_internal);
/* Returns list of struct str_lists containing pool-allocated copy of vgids */
/* Set full_scan to 1 to reread every filtered device label. If include_internal
* is not set, return only proper vg ids. */
struct dm_list *lvmcache_get_vgids(struct cmd_context *cmd, int full_scan,
int include_internal);
/* If include_internal is not set, return only proper vg ids. */
struct dm_list *lvmcache_get_vgids(struct cmd_context *cmd,
int include_internal);
/* Returns list of struct str_lists containing pool-allocated copy of pvids */
struct dm_list *lvmcache_get_pvids(struct cmd_context *cmd, const char *vgname,

7
lib/metadata/metadata-exported.h
View File

@ -398,11 +398,8 @@ int unlink_lv_from_vg(struct logical_volume *lv);
void lv_set_visible(struct logical_volume *lv);
void lv_set_hidden(struct logical_volume *lv);
/* Set full_scan to 1 to re-read every (filtered) device label */
struct dm_list *get_vgnames(struct cmd_context *cmd, int full_scan,
int include_internal);
struct dm_list *get_vgids(struct cmd_context *cmd, int full_scan,
int include_internal);
struct dm_list *get_vgnames(struct cmd_context *cmd, int include_internal);
struct dm_list *get_vgids(struct cmd_context *cmd, int include_internal);
int scan_vgs_for_pvs(struct cmd_context *cmd);
int pv_write(struct cmd_context *cmd, struct physical_volume *pv,

15
lib/metadata/metadata.c
View File

@ -2967,7 +2967,8 @@ static struct volume_group *_vg_read_by_vgid(struct cmd_context *cmd,
* allowed to do a full scan here any more. */
// The slow way - full scan required to cope with vgrename
if (!(vgnames = get_vgnames(cmd, 2, 0))) {
lvmcache_label_scan(cmd, 2);
if (!(vgnames = get_vgnames(cmd, 0))) {
log_error("vg_read_by_vgid: get_vgnames failed");
goto out;
}
@ -3103,16 +3104,14 @@ bad:
}
/* May return empty list */
struct dm_list *get_vgnames(struct cmd_context *cmd, int full_scan,
int include_internal)
struct dm_list *get_vgnames(struct cmd_context *cmd, int include_internal)
{
return lvmcache_get_vgnames(cmd, full_scan, include_internal);
return lvmcache_get_vgnames(cmd, include_internal);
}
struct dm_list *get_vgids(struct cmd_context *cmd, int full_scan,
int include_internal)
struct dm_list *get_vgids(struct cmd_context *cmd, int include_internal)
{
return lvmcache_get_vgids(cmd, full_scan, include_internal);
return lvmcache_get_vgids(cmd, include_internal);
}
static int _get_pvs(struct cmd_context *cmd, struct dm_list **pvslist)
@ -3138,7 +3137,7 @@ static int _get_pvs(struct cmd_context *cmd, struct dm_list **pvslist)
}
/* Get list of VGs */
if (!(vgids = get_vgids(cmd, 0, 1))) {
if (!(vgids = get_vgids(cmd, 1))) {
log_error("get_pvs: get_vgids failed");
return 0;
}

4
liblvm/lvm_vg.c
View File

@ -351,12 +351,12 @@ char *lvm_vg_get_name(const vg_t vg)
struct dm_list *lvm_list_vg_names(lvm_t libh)
{
return get_vgnames((struct cmd_context *)libh, 0, 0);
return get_vgnames((struct cmd_context *)libh, 0);
}
struct dm_list *lvm_list_vg_uuids(lvm_t libh)
{
return get_vgids((struct cmd_context *)libh, 0, 0);
return get_vgids((struct cmd_context *)libh, 0);
}
/*

6
tools/toollib.c
View File

@ -275,7 +275,7 @@ int process_each_lv(struct cmd_context *cmd, int argc, char **argv,
if (!argc || !dm_list_empty(&tags)) {
log_verbose("Finding all logical volumes");
if (!(vgnames = get_vgnames(cmd, 0, 0)) || dm_list_empty(vgnames)) {
if (!(vgnames = get_vgnames(cmd, 0)) || dm_list_empty(vgnames)) {
log_error("No volume groups found");
return ret_max;
}
@ -518,7 +518,7 @@ int process_each_vg(struct cmd_context *cmd, int argc, char **argv,
if (!argc || !dm_list_empty(&tags)) {
log_verbose("Finding all volume groups");
if (!(vgids = get_vgids(cmd, 0, 0)) || dm_list_empty(vgids)) {
if (!(vgids = get_vgids(cmd, 0)) || dm_list_empty(vgids)) {
log_error("No volume groups found");
return ret_max;
}
@ -723,7 +723,7 @@ int process_each_pv(struct cmd_context *cmd, int argc, char **argv,
if (sigint_caught())
goto out;
}
if (!dm_list_empty(&tags) && (vgnames = get_vgnames(cmd, 0, 1)) &&
if (!dm_list_empty(&tags) && (vgnames = get_vgnames(cmd, 1)) &&
!dm_list_empty(vgnames)) {
dm_list_iterate_items(sll, vgnames) {
vg = vg_read(cmd, sll->str, NULL, flags);

2
tools/vgrename.c
View File

@ -87,7 +87,7 @@ static int vg_rename_path(struct cmd_context *cmd, const char *old_vg_path,
log_verbose("Checking for existing volume group \"%s\"", vg_name_old);
/* Avoid duplicates */
if (!(vgids = get_vgids(cmd, 0, 0)) || dm_list_empty(vgids)) {
if (!(vgids = get_vgids(cmd, 0)) || dm_list_empty(vgids)) {
log_error("No complete volume groups found");
return 0;
}