[PATCH][next] fs/9p: remove redundant variable ret

Colin Ian King posted 1 patch 2 weeks, 3 days ago
fs/9p/v9fs.c | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
[PATCH][next] fs/9p: remove redundant variable ret
Posted by Colin Ian King 2 weeks, 3 days ago
The assignments and return checks on ret are redundant. Clean up
the code by just returning the return value from the call to
v9fs_init_inode_cache.

Signed-off-by: Colin Ian King <colin.i.king@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.39.5
Re: [PATCH][next] fs/9p: remove redundant variable ret
Posted by Dan Carpenter 2 weeks, 3 days ago
On Wed, Nov 06, 2024 at 03:22:09PM +0000, Colin Ian King wrote:
> The assignments and return checks on ret are redundant. Clean up
> the code by just returning the return value from the call to
> v9fs_init_inode_cache.
> 
> Signed-off-by: Colin Ian King <colin.i.king@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();
>  }

Better to delete the whole function and call v9fs_init_inode_cache()
directly.

regards,
dan carpenter
Re: [PATCH][next] fs/9p: remove redundant variable ret
Posted by Dominique Martinet 2 weeks, 3 days ago
Dan Carpenter wrote on Thu, Nov 07, 2024 at 12:45:33AM +0300:
> On Wed, Nov 06, 2024 at 03:22:09PM +0000, Colin Ian King wrote:
> > The assignments and return checks on ret are redundant. Clean up
> > the code by just returning the return value from the call to
> > v9fs_init_inode_cache.
> [...]
> 
> Better to delete the whole function and call v9fs_init_inode_cache()
> directly.

Makes sense, and if we go there delete v9fs_cache_unregister as well so
the init/destroy pair properly; that also is a single function call.

Thanks!
-- 
Dominique Martinet | Asmadeus
Re: [PATCH][next] fs/9p: remove redundant variable ret
Posted by Colin King (gmail) 2 weeks, 2 days ago
On 06/11/2024 22:54, Dominique Martinet wrote:
> Dan Carpenter wrote on Thu, Nov 07, 2024 at 12:45:33AM +0300:
>> On Wed, Nov 06, 2024 at 03:22:09PM +0000, Colin Ian King wrote:
>>> The assignments and return checks on ret are redundant. Clean up
>>> the code by just returning the return value from the call to
>>> v9fs_init_inode_cache.
>> [...]
>>
>> Better to delete the whole function and call v9fs_init_inode_cache()
>> directly.
> 
> Makes sense, and if we go there delete v9fs_cache_unregister as well so
> the init/destroy pair properly; that also is a single function call.
> 
> Thanks!
OK, will do.

Colin