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

gcc: avoid shadowing activate_lv

Browse Source 
Function activate_lv() is already declared, avoid its shadowing.
activate.h:133: warning: shadowed declaration is here
This commit is contained in:
Zdenek Kabelac 2018-11-30 21:50:41 +01:00
parent 1aac59f82a
commit 0d61a17152
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/activate/activate.c
View File

@ -2476,19 +2476,19 @@ out:
/* Test if LV passes filter */
int lv_activation_filter(struct cmd_context *cmd, const char *lvid_s,
int *activate_lv, const struct logical_volume *lv)
int *activate, const struct logical_volume *lv)
{
if (!activation()) {
*activate_lv = 1;
*activate = 1;
return 1;
}
if (!_passes_activation_filter(cmd, lv)) {
log_verbose("Not activating %s since it does not pass "
"activation filter.", display_lvname(lv));
*activate_lv = 0;
*activate = 0;
} else
*activate_lv = 1;
*activate = 1;
return 1;
}

4
lib/activate/activate.h
View File

@ -162,10 +162,10 @@ int lv_info_with_seg_status(struct cmd_context *cmd,
int lv_check_not_in_use(const struct logical_volume *lv, int error_if_used);
/*
* Returns 1 if activate_lv has been set: 1 = activate; 0 = don't.
* Returns 1 if activate has been set: 1 = activate; 0 = don't.
*/
int lv_activation_filter(struct cmd_context *cmd, const char *lvid_s,
int *activate_lv, const struct logical_volume *lv);
int *activate, const struct logical_volume *lv);
/*
* Checks against the auto_activation_volume_list and
* returns 1 if the LV should be activated, 0 otherwise.