diff mbox series

[v2,2/5] check: Remove redundant _test_mount in check

Message ID 6a8a7c590e9631c0bc6499e9d2986a6d638c582a.1743487913.git.nirjhar.roy.lists@gmail.com (mailing list archive)
State New
Headers show
Series Minor cleanups in common/ | expand

Commit Message

Nirjhar Roy (IBM) April 1, 2025, 6:43 a.m. UTC
init_rc already does a _test_mount. Hence removing the additional
_test_mount call when OLD_TEST_FS_MOUNT_OPTS != TEST_FS_MOUNT_OPTS.

Signed-off-by: Nirjhar Roy (IBM) <nirjhar.roy.lists@gmail.com>
---
 check | 6 ------
 1 file changed, 6 deletions(-)

Comments

Ritesh Harjani (IBM) April 4, 2025, 3:36 a.m. UTC | #1
"Nirjhar Roy (IBM)" <nirjhar.roy.lists@gmail.com> writes:

> init_rc already does a _test_mount. Hence removing the additional
> _test_mount call when OLD_TEST_FS_MOUNT_OPTS != TEST_FS_MOUNT_OPTS.
>
> Signed-off-by: Nirjhar Roy (IBM) <nirjhar.roy.lists@gmail.com>
> ---
>  check | 6 ------
>  1 file changed, 6 deletions(-)
>
> diff --git a/check b/check
> index 32890470..16bf1586 100755
> --- a/check
> +++ b/check
> @@ -792,12 +792,6 @@ function run_section()
>  		_prepare_test_list
>  	elif [ "$OLD_TEST_FS_MOUNT_OPTS" != "$TEST_FS_MOUNT_OPTS" ]; then
>  		_test_unmount 2> /dev/null

Would have been nicer if there was a small comment here like:

  	elif [ "$OLD_TEST_FS_MOUNT_OPTS" != "$TEST_FS_MOUNT_OPTS" ]; then
        # Unmount TEST_DEV to apply the updated mount options.
        # It will be mounted again by init_rc(), called shortly after.
        _test_unmount 2> /dev/null
    fi

    init_rc

But either ways, no strong preference for adding comments here.

Feel free to add - 
Reviewed-by: Ritesh Harjani (IBM) <ritesh.list@gmail.com>


> -		if ! _test_mount
> -		then
> -			echo "check: failed to mount $TEST_DEV on $TEST_DIR"
> -			status=1
> -			exit
> -		fi
>  	fi
>  
>  	init_rc
> -- 
> 2.34.1
Nirjhar Roy (IBM) April 8, 2025, 5:41 a.m. UTC | #2
On 4/4/25 09:06, Ritesh Harjani (IBM) wrote:
> "Nirjhar Roy (IBM)" <nirjhar.roy.lists@gmail.com> writes:
>
>> init_rc already does a _test_mount. Hence removing the additional
>> _test_mount call when OLD_TEST_FS_MOUNT_OPTS != TEST_FS_MOUNT_OPTS.
>>
>> Signed-off-by: Nirjhar Roy (IBM) <nirjhar.roy.lists@gmail.com>
>> ---
>>   check | 6 ------
>>   1 file changed, 6 deletions(-)
>>
>> diff --git a/check b/check
>> index 32890470..16bf1586 100755
>> --- a/check
>> +++ b/check
>> @@ -792,12 +792,6 @@ function run_section()
>>   		_prepare_test_list
>>   	elif [ "$OLD_TEST_FS_MOUNT_OPTS" != "$TEST_FS_MOUNT_OPTS" ]; then
>>   		_test_unmount 2> /dev/null
> Would have been nicer if there was a small comment here like:
>
>    	elif [ "$OLD_TEST_FS_MOUNT_OPTS" != "$TEST_FS_MOUNT_OPTS" ]; then
>          # Unmount TEST_DEV to apply the updated mount options.
>          # It will be mounted again by init_rc(), called shortly after.
>          _test_unmount 2> /dev/null
>      fi
>
>      init_rc
>
> But either ways, no strong preference for adding comments here.

Added in [v3]

[v3] 
https://lore.kernel.org/all/ffefbe485f71206dd2a0a27256d1101d2b0c7a64.1744090313.git.nirjhar.roy.lists@gmail.com/

Thank you for pointing out.

--NR

>
> Feel free to add -
> Reviewed-by: Ritesh Harjani (IBM) <ritesh.list@gmail.com>
>
>
>> -		if ! _test_mount
>> -		then
>> -			echo "check: failed to mount $TEST_DEV on $TEST_DIR"
>> -			status=1
>> -			exit
>> -		fi
>>   	fi
>>   
>>   	init_rc
>> -- 
>> 2.34.1
Nirjhar Roy (IBM) April 8, 2025, 5:45 a.m. UTC | #3
On 4/4/25 09:06, Ritesh Harjani (IBM) wrote:
> "Nirjhar Roy (IBM)" <nirjhar.roy.lists@gmail.com> writes:
>
>> init_rc already does a _test_mount. Hence removing the additional
>> _test_mount call when OLD_TEST_FS_MOUNT_OPTS != TEST_FS_MOUNT_OPTS.
>>
>> Signed-off-by: Nirjhar Roy (IBM) <nirjhar.roy.lists@gmail.com>
>> ---
>>   check | 6 ------
>>   1 file changed, 6 deletions(-)
>>
>> diff --git a/check b/check
>> index 32890470..16bf1586 100755
>> --- a/check
>> +++ b/check
>> @@ -792,12 +792,6 @@ function run_section()
>>   		_prepare_test_list
>>   	elif [ "$OLD_TEST_FS_MOUNT_OPTS" != "$TEST_FS_MOUNT_OPTS" ]; then
>>   		_test_unmount 2> /dev/null
> Would have been nicer if there was a small comment here like:
>
>    	elif [ "$OLD_TEST_FS_MOUNT_OPTS" != "$TEST_FS_MOUNT_OPTS" ]; then
>          # Unmount TEST_DEV to apply the updated mount options.
>          # It will be mounted again by init_rc(), called shortly after.
>          _test_unmount 2> /dev/null
>      fi
>
>      init_rc
>
> But either ways, no strong preference for adding comments here.

Addressed in 
https://lore.kernel.org/all/fa1bfd04d6b592f4d812a90039c643a02d7e1033.1744090313.git.nirjhar.roy.lists@gmail.com/ 
. Please ignore the previous link. I mistakenly gave the link to patch 2/6.

--NR

>
> Feel free to add -
> Reviewed-by: Ritesh Harjani (IBM) <ritesh.list@gmail.com>
>
>
>> -		if ! _test_mount
>> -		then
>> -			echo "check: failed to mount $TEST_DEV on $TEST_DIR"
>> -			status=1
>> -			exit
>> -		fi
>>   	fi
>>   
>>   	init_rc
>> -- 
>> 2.34.1
diff mbox series

Patch

diff --git a/check b/check
index 32890470..16bf1586 100755
--- a/check
+++ b/check
@@ -792,12 +792,6 @@  function run_section()
 		_prepare_test_list
 	elif [ "$OLD_TEST_FS_MOUNT_OPTS" != "$TEST_FS_MOUNT_OPTS" ]; then
 		_test_unmount 2> /dev/null
-		if ! _test_mount
-		then
-			echo "check: failed to mount $TEST_DEV on $TEST_DIR"
-			status=1
-			exit
-		fi
 	fi
 
 	init_rc