diff options
| author | David Teigland <teigland@redhat.com> | 2015-11-12 09:35:41 -0600 |
|---|---|---|
| committer | David Teigland <teigland@redhat.com> | 2015-11-12 09:35:41 -0600 |
| commit | 43777b551d840a55d70e862bff751e7208c8eaf4 (patch) | |
| tree | 3057f74a4fb72e0db7ec330fb1dedf46d7656618 | |
| parent | 058725c72149e9f852390ca1d52e932ddb745a82 (diff) | |
| download | lvm2-43777b551d840a55d70e862bff751e7208c8eaf4.tar.gz | |
lvmetad: tail chasing to shut up coverity
| -rw-r--r-- | daemons/lvmetad/lvmetad-core.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/daemons/lvmetad/lvmetad-core.c b/daemons/lvmetad/lvmetad-core.c index 781cfc67c..f7df5fd30 100644 --- a/daemons/lvmetad/lvmetad-core.c +++ b/daemons/lvmetad/lvmetad-core.c @@ -1346,8 +1346,14 @@ static int _update_metadata(lvmetad_state *s, const char *arg_name, const char * int abort_daemon = 0; int retval = 0; + if (!arg_vgid || !arg_name) { + ERROR(s, "update_metadata missing args arg_vgid %s arg_name %s pvid %s", + arg_vgid ?: "none", arg_name ?: "none", pvid ?: "none"); + return 0; + } + DEBUGLOG(s, "update_metadata begin arg_vgid %s arg_name %s pvid %s", - arg_vgid ?: "none", arg_name ?: "none", pvid ?: "none"); + arg_vgid, arg_name, pvid ?: "none"); /* * Begin by figuring out what has changed: @@ -1378,7 +1384,7 @@ static int _update_metadata(lvmetad_state *s, const char *arg_name, const char * * A lookup of the name arg was successful in finding arg_vgid_lookup, * but that resulting vgid doesn't match the arg_vgid. */ - if (arg_vgid_lookup && arg_vgid && strcmp(arg_vgid_lookup, arg_vgid)) { + if (arg_vgid_lookup && strcmp(arg_vgid_lookup, arg_vgid)) { if (arg_name_lookup) { /* * This shouldn't happen. @@ -1419,7 +1425,7 @@ static int _update_metadata(lvmetad_state *s, const char *arg_name, const char * * A lookup of the vgid arg was successful in finding arg_name_lookup, * but that resulting name doesn't match the arg_name. */ - if (arg_name_lookup && arg_name && strcmp(arg_name_lookup, arg_name)) { + if (arg_name_lookup && strcmp(arg_name_lookup, arg_name)) { if (arg_vgid_lookup) { /* * This shouldn't happen. |