f2fs: remove some dead code

[PATCH] f2fs: remove some dead code

Posted by Christophe JAILLET 2 years, 8 months ago

'ret' is known to be 0 at the point.
So these lines of code should just be removed.

Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
---
The dead code became after commit 	8358014d6be8 ("f2fs: avoid to check
PG_error flag")
---
 fs/f2fs/node.c | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/fs/f2fs/node.c b/fs/f2fs/node.c
index bd1dad523796..e7bc87177e18 100644
--- a/fs/f2fs/node.c
+++ b/fs/f2fs/node.c
@@ -2063,7 +2063,7 @@ int f2fs_wait_on_node_pages_writeback(struct f2fs_sb_info *sbi,
 	struct list_head *head = &sbi->fsync_node_list;
 	unsigned long flags;
 	unsigned int cur_seq_id = 0;
-	int ret2, ret = 0;
+	int ret;
 
 	while (seq_id && cur_seq_id < seq_id) {
 		spin_lock_irqsave(&sbi->fsync_node_lock, flags);
@@ -2084,14 +2084,9 @@ int f2fs_wait_on_node_pages_writeback(struct f2fs_sb_info *sbi,
 		f2fs_wait_on_page_writeback(page, NODE, true, false);
 
 		put_page(page);
-
-		if (ret)
-			break;
 	}
 
-	ret2 = filemap_check_errors(NODE_MAPPING(sbi));
-	if (!ret)
-		ret = ret2;
+	ret = filemap_check_errors(NODE_MAPPING(sbi));
 
 	return ret;
 }
-- 
2.34.1

Re: [PATCH] f2fs: remove some dead code

Posted by Dan Carpenter 2 years, 8 months ago

On Mon, Apr 17, 2023 at 10:51:46PM +0200, Christophe JAILLET wrote:
>  
> -	ret2 = filemap_check_errors(NODE_MAPPING(sbi));
> -	if (!ret)
> -		ret = ret2;
> +	ret = filemap_check_errors(NODE_MAPPING(sbi));
>  
>  	return ret;

Let's get rid of "ret" as well:

	return filemap_check_errors(NODE_MAPPING(sbi));

regards,
dan carpenter

Re: [PATCH] f2fs: remove some dead code

Posted by Jaegeuk Kim 2 years, 7 months ago

On 04/18, Dan Carpenter wrote:
> On Mon, Apr 17, 2023 at 10:51:46PM +0200, Christophe JAILLET wrote:
> >  
> > -	ret2 = filemap_check_errors(NODE_MAPPING(sbi));
> > -	if (!ret)
> > -		ret = ret2;
> > +	ret = filemap_check_errors(NODE_MAPPING(sbi));
> >  
> >  	return ret;
> 
> Let's get rid of "ret" as well:
> 
> 	return filemap_check_errors(NODE_MAPPING(sbi));

Applied with this modification. Thanks.

> 
> regards,
> dan carpenter

Re: [PATCH] f2fs: remove some dead code

Posted by Chao Yu 2 years, 7 months ago

On 2023/4/28 0:28, Jaegeuk Kim wrote:
> On 04/18, Dan Carpenter wrote:
>> On Mon, Apr 17, 2023 at 10:51:46PM +0200, Christophe JAILLET wrote:
>>>   
>>> -	ret2 = filemap_check_errors(NODE_MAPPING(sbi));
>>> -	if (!ret)
>>> -		ret = ret2;
>>> +	ret = filemap_check_errors(NODE_MAPPING(sbi));
>>>   
>>>   	return ret;
>>
>> Let's get rid of "ret" as well:
>>
>> 	return filemap_check_errors(NODE_MAPPING(sbi));
> 
> Applied with this modification. Thanks.

Reviewed-by: Chao Yu <chao@kernel.org>

Thanks,

> 
>>
>> regards,
>> dan carpenter