[Devel] [PATCH RHEL9 COMMIT] ms/selftests/move_mount_set_group remove unneeded conversion to bool

[Konstantin Khorenko]

The commit is pushed to "branch-rh9-5.14.0-162.18.1.vz9.19.x-ovz" and will 
appear at https://src.openvz.org/scm/ovz/vzkernel.git
after rh9-5.14.0-162.18.1.vz9.19.7
------>
commit aa7e350546bf08708d8bf8cd5cb3e8b77132f651
Author: Yang Guang <yang.gua...@zte.com.cn>
Date:   Fri Apr 7 14:36:52 2023 +0800

    ms/selftests/move_mount_set_group remove unneeded conversion to bool
    
    The coccinelle report
    
./tools/testing/selftests/move_mount_set_group/move_mount_set_group_test.c:225:18-23:
    WARNING: conversion to bool not needed here
    Relational and logical operators evaluate to bool,
    explicit conversion is overly verbose and unneeded.
    
    Reported-by: Zeal Robot <zea...@zte.com.cn>
    Signed-off-by: Yang Guang <yang.gua...@zte.com.cn>
    Signed-off-by: Shuah Khan <sk...@linuxfoundation.org>
    
    https://jira.sw.ru/browse/PSBM-144416
    (cherry picked from ms commit 009482c0932ae2420277dc0adaefa5bd51cb433e)
    Signed-off-by: Pavel Tikhomirov <ptikhomi...@virtuozzo.com>
    
    ======
    Patchset description:
    mount: Port move_mount_set_group related patches
    
    We need this as in Virtuozzo criu after rebase to mainstream criu in u20
    we will switch to this new API for sharing group setting accross mounts.
    
    https://jira.sw.ru/browse/PSBM-144416
    
    Feature: mount: port move_mount_set_group related patches
---
 .../selftests/move_mount_set_group/move_mount_set_group_test.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git 
a/tools/testing/selftests/move_mount_set_group/move_mount_set_group_test.c 
b/tools/testing/selftests/move_mount_set_group/move_mount_set_group_test.c
index 860198f83a53..50ed5d475dd1 100644
--- a/tools/testing/selftests/move_mount_set_group/move_mount_set_group_test.c
+++ b/tools/testing/selftests/move_mount_set_group/move_mount_set_group_test.c
@@ -191,7 +191,7 @@ static bool is_shared_mount(const char *path)
 #define SET_GROUP_FROM "/tmp/move_mount_set_group_supported_from"
 #define SET_GROUP_TO   "/tmp/move_mount_set_group_supported_to"
 
-static int move_mount_set_group_supported(void)
+static bool move_mount_set_group_supported(void)
 {
        int ret;
 
@@ -222,7 +222,7 @@ static int move_mount_set_group_supported(void)
                      AT_FDCWD, SET_GROUP_TO, MOVE_MOUNT_SET_GROUP);
        umount2("/tmp", MNT_DETACH);
 
-       return ret < 0 ? false : true;
+       return ret >= 0;
 }
 
 FIXTURE(move_mount_set_group) {
@@ -232,7 +232,7 @@ FIXTURE(move_mount_set_group) {
 
 FIXTURE_SETUP(move_mount_set_group)
 {
-       int ret;
+       bool ret;
 
        ASSERT_EQ(prepare_unpriv_mountns(), 0);
 
@@ -254,7 +254,7 @@ FIXTURE_SETUP(move_mount_set_group)
 
 FIXTURE_TEARDOWN(move_mount_set_group)
 {
-       int ret;
+       bool ret;
 
        ret = move_mount_set_group_supported();
        ASSERT_GE(ret, 0);
@@ -348,7 +348,7 @@ TEST_F(move_mount_set_group, complex_sharing_copying)
                .shared = false,
        };
        pid_t pid;
-       int ret;
+       bool ret;
 
        ret = move_mount_set_group_supported();
        ASSERT_GE(ret, 0);
_______________________________________________
Devel mailing list
Devel@openvz.org
https://lists.openvz.org/mailman/listinfo/devel