diff options
| author | Zdenek Kabelac <zkabelac@redhat.com> | 2016-04-08 19:34:56 +0200 |
|---|---|---|
| committer | Zdenek Kabelac <zkabelac@redhat.com> | 2016-04-08 20:20:16 +0200 |
| commit | 5cfa6cb347c5b7d8c5e3119b59bc7331388cb47e (patch) | |
| tree | 768b20a2e98d7eba3c606f779071b065df4e0535 | |
| parent | 74e704bb4465960b361711c890733cbae1f06e42 (diff) | |
| download | lvm2-5cfa6cb347c5b7d8c5e3119b59bc7331388cb47e.tar.gz | |
cleanup: simplier to read condition
Make more readable what we are looking for and just test for
KERNEL version at one place.
| -rw-r--r-- | lib/activate/dev_manager.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/lib/activate/dev_manager.c b/lib/activate/dev_manager.c index 8c01b4345..3f916542b 100644 --- a/lib/activate/dev_manager.c +++ b/lib/activate/dev_manager.c @@ -669,14 +669,15 @@ static int _original_uuid_format_check_required(struct cmd_context *cmd) static int _kernel_major = 0; if (!_kernel_major) { - if ((sscanf(cmd->kernel_vsn, "%d", &_kernel_major) != 1)) - _kernel_major = 1; - else if (_kernel_major >= MIN_KERNEL_MAJOR) + if ((sscanf(cmd->kernel_vsn, "%d", &_kernel_major) == 1) && + (_kernel_major >= MIN_KERNEL_MAJOR)) log_debug_activation("Skipping checks for old devices without " UUID_PREFIX " dm uuid prefix (kernel vsn %d >= %d).", _kernel_major, MIN_KERNEL_MAJOR); + else + _kernel_major = -1; } - return (_kernel_major < MIN_KERNEL_MAJOR); + return (_kernel_major == -1); } static int _info(struct cmd_context *cmd, const char *dlid, int with_open_count, int with_read_ahead, |