9p/fs: Different branch return the same value

[PATCH] 9p/fs: Different branch return the same value

Posted by Rex Nie 1 year, 2 months ago

The same code is executed when the condition ret < 0 is true or false.
Remove the if branch and just return v9fs_init_inode_cache(). This
does not change the semantics of the original code.

Signed-off-by: Rex Nie <rexnie3@gmail.com>
---
 fs/9p/v9fs.c | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/fs/9p/v9fs.c b/fs/9p/v9fs.c
index 281a1ed03a04..ee0a374e0d9d 100644
--- a/fs/9p/v9fs.c
+++ b/fs/9p/v9fs.c
@@ -661,12 +661,7 @@ static void v9fs_destroy_inode_cache(void)
 
 static int v9fs_cache_register(void)
 {
-	int ret;
-
-	ret = v9fs_init_inode_cache();
-	if (ret < 0)
-		return ret;
-	return ret;
+	return v9fs_init_inode_cache();
 }
 
 static void v9fs_cache_unregister(void)
-- 
2.17.1

Re: [PATCH] 9p/fs: Different branch return the same value

Posted by Christophe JAILLET 1 year, 2 months ago

Le 16/11/2024 à 16:26, Rex Nie a écrit :
> The same code is executed when the condition ret < 0 is true or false.
> Remove the if branch and just return v9fs_init_inode_cache(). This
> does not change the semantics of the original code.
> 
> Signed-off-by: Rex Nie <rexnie3@gmail.com>
> ---
>   fs/9p/v9fs.c | 7 +------
>   1 file changed, 1 insertion(+), 6 deletions(-)
> 
> diff --git a/fs/9p/v9fs.c b/fs/9p/v9fs.c
> index 281a1ed03a04..ee0a374e0d9d 100644
> --- a/fs/9p/v9fs.c
> +++ b/fs/9p/v9fs.c
> @@ -661,12 +661,7 @@ static void v9fs_destroy_inode_cache(void)
>   
>   static int v9fs_cache_register(void)
>   {
> -	int ret;
> -
> -	ret = v9fs_init_inode_cache();
> -	if (ret < 0)
> -		return ret;
> -	return ret;
> +	return v9fs_init_inode_cache();
>   }
>   
>   static void v9fs_cache_unregister(void)

Hi,

a similar patch has already been sent.

See [1], which is the v2 of the patch and goes one step further.

CJ

[1]: 
https://lore.kernel.org/linux-kernel/20241107095756.10261-1-colin.i.king@gmail.com/

Re: [PATCH] 9p/fs: Different branch return the same value

Posted by Christian Schoenebeck 1 year, 2 months ago

On Saturday, November 16, 2024 4:26:12 PM CET Rex Nie wrote:
> The same code is executed when the condition ret < 0 is true or false.
> Remove the if branch and just return v9fs_init_inode_cache(). This
> does not change the semantics of the original code.
> 
> Signed-off-by: Rex Nie <rexnie3@gmail.com>
> ---
>  fs/9p/v9fs.c | 7 +------
>  1 file changed, 1 insertion(+), 6 deletions(-)

Too late to the party: :)

https://lore.kernel.org/all/20241107095756.10261-1-colin.i.king@gmail.com/

But thanks!

/Christian