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

cleanup: gather version info with single check

Browse Source 
As we already collect version info anyway, allow to use it through
a single call (can makes logs shorter and saves ioctl).
This commit is contained in:
Zdenek Kabelac 2016-04-27 11:11:58 +02:00
parent def65507e6
commit 4d116d7a28
3 changed files with 18 additions and 7 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.153 - Version 2.02.153 -
================================== ==================================
Add function to check for target presence and version via 1 ioctl.
Version 2.02.152 - 30th April 2016 Version 2.02.152 - 30th April 2016
================================== ==================================

21
lib/activate/activate.c
View File

@ -632,25 +632,32 @@ int module_present(struct cmd_context *cmd, const char *target_name)
return ret; return ret;
} }
int target_present(struct cmd_context *cmd, const char *target_name, int target_present_version(struct cmd_context *cmd, const char *target_name,
int use_modprobe) int use_modprobe,
uint32_t *maj, uint32_t *min, uint32_t *patchlevel)
{ {
uint32_t maj, min, patchlevel;
if (!activation()) if (!activation())
return 0; return_0;
#ifdef MODPROBE_CMD #ifdef MODPROBE_CMD
if (use_modprobe) { if (use_modprobe) {
if (target_version(target_name, &maj, &min, &patchlevel)) if (target_version(target_name, maj, min, patchlevel))
return 1; return 1;
if (!module_present(cmd, target_name)) if (!module_present(cmd, target_name))
return_0; return_0;
} }
#endif #endif
return target_version(target_name, maj, min, patchlevel);
}
return target_version(target_name, &maj, &min, &patchlevel); int target_present(struct cmd_context *cmd, const char *target_name,
int use_modprobe)
{
uint32_t maj, min, patchlevel;
return target_present_version(cmd, target_name, use_modprobe,
&maj, &min, &patchlevel);
} }
static int _lv_info(struct cmd_context *cmd, const struct logical_volume *lv, static int _lv_info(struct cmd_context *cmd, const struct logical_volume *lv,

3
lib/activate/activate.h
View File

@ -92,6 +92,9 @@ int library_version(char *version, size_t size);
int lvm1_present(struct cmd_context *cmd); int lvm1_present(struct cmd_context *cmd);
int module_present(struct cmd_context *cmd, const char *target_name); int module_present(struct cmd_context *cmd, const char *target_name);
int target_present_version(struct cmd_context *cmd, const char *target_name,
int use_modprobe, uint32_t *maj,
uint32_t *min, uint32_t *patchlevel);
int target_present(struct cmd_context *cmd, const char *target_name, int target_present(struct cmd_context *cmd, const char *target_name,
int use_modprobe); int use_modprobe);
int target_version(const char *target_name, uint32_t *maj, int target_version(const char *target_name, uint32_t *maj,