shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2025-01-03 05:18:29 +03:00
Code Releases Activity

lvmetad: use lookup_withval in another location

Browse Source 
Simply use lookup_withval right away rather than doing a
standard lookup, checking for the wrong mapping, then
repeating with lookup_withval to get the right mapping.
This commit is contained in:
David Teigland 2015-11-16 14:44:32 -06:00
parent 4a984cabc4
commit 68c386cce7
1 changed files with 1 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
daemons/lvmetad/lvmetad-core.c
View File

@ -1342,7 +1342,6 @@ static int _update_metadata(lvmetad_state *s, const char *arg_name, const char *
const char *new_name = NULL; const char *new_name = NULL;
const char *old_vgid = NULL; const char *old_vgid = NULL;
const char *new_vgid = NULL; const char *new_vgid = NULL;
const char *arg_vgid2 = NULL;
const char *old_vgid2 = NULL; const char *old_vgid2 = NULL;
const char *new_metadata_vgid; const char *new_metadata_vgid;
int old_seq = -1; int old_seq = -1;
@ -1370,47 +1369,7 @@ static int _update_metadata(lvmetad_state *s, const char *arg_name, const char *
lock_vgid_to_metadata(s); lock_vgid_to_metadata(s);
arg_name_lookup = dm_hash_lookup(s->vgid_to_vgname, arg_vgid); arg_name_lookup = dm_hash_lookup(s->vgid_to_vgname, arg_vgid);
arg_vgid_lookup = dm_hash_lookup(s->vgname_to_vgid, arg_name); arg_vgid_lookup = dm_hash_lookup_withval(s->vgname_to_vgid, arg_name, arg_vgid, strlen(arg_vgid) + 1);
/*
* A new PV has been found with a VG that:
* has a vgid we don't know about (null arg_name_lookup),
* has a name we do know about (non-null arg_vgid_lookup).
* This happens when there are two different VGs with the
* same name.
*/
if (pvid && !arg_name_lookup && arg_vgid_lookup &&
strcmp(arg_vgid_lookup, arg_vgid)) {
if ((arg_vgid2 = dm_hash_lookup_withval(s->vgname_to_vgid, arg_name, arg_vgid, strlen(arg_vgid) + 1))) {
/* This VG already exists in the cache. */
DEBUGLOG(s, "update_metadata arg_vgid %s arg_name %s found VG with same name as %s",
arg_vgid, arg_name, arg_vgid_lookup);
arg_vgid_lookup = arg_vgid2;
} else {
/* This VG doesn't exist in cache yet. */
DEBUGLOG(s, "update_metadata arg_vgid %s arg_name %s found VG with same name as %s",
arg_vgid, arg_name, arg_vgid_lookup);
arg_vgid_lookup = NULL;
}
}
/*
* Updated VG metadata has been sent from a command
* for a VG but we have two VGs with this same name,
* so we need to figure out which of the VGs it is.
*/
if (!pvid && arg_name_lookup && arg_vgid_lookup &&
!strcmp(arg_name_lookup, arg_name) &&
strcmp(arg_vgid_lookup, arg_vgid)) {
if ((arg_vgid2 = dm_hash_lookup_withval(s->vgname_to_vgid, arg_name, arg_vgid, strlen(arg_vgid) + 1))) {
/* The first lookup found the another VG with the same name. */
DEBUGLOG(s, "update_metadata arg_vgid %s arg_name %s update VG with same name as %s",
arg_vgid, arg_name, arg_vgid_lookup);
arg_vgid_lookup = arg_vgid2;
} else {
/* This case is detected as an error below. */
}
}
/* /*
* A new VG when there is no existing record of the name or vgid args. * A new VG when there is no existing record of the name or vgid args.