diff mbox series

f2fs: always expose label 'next_page'

Message ID 020937f3-2947-ca41-c18a-026782216711@infradead.org
State New
Headers show
Series f2fs: always expose label 'next_page' | expand

Commit Message

Randy Dunlap June 30, 2020, 5:09 p.m. UTC
From: Randy Dunlap <rdunlap@infradead.org>

Fix build error when F2FS_FS_COMPRESSION is not set/enabled.
This label is needed in either case.

../fs/f2fs/data.c: In function ‘f2fs_mpage_readpages’:
../fs/f2fs/data.c:2327:5: error: label ‘next_page’ used but not defined
     goto next_page;

Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
Cc: Jaegeuk Kim <jaegeuk@kernel.org>
Cc: Chao Yu <yuchao0@huawei.com>
Cc: linux-f2fs-devel@lists.sourceforge.net
---
 fs/f2fs/data.c |    2 --
 1 file changed, 2 deletions(-)

Comments

Jaegeuk Kim June 30, 2020, 8:23 p.m. UTC | #1
On 06/30, Randy Dunlap wrote:
> From: Randy Dunlap <rdunlap@infradead.org>
> 
> Fix build error when F2FS_FS_COMPRESSION is not set/enabled.
> This label is needed in either case.
> 
> ../fs/f2fs/data.c: In function ‘f2fs_mpage_readpages’:
> ../fs/f2fs/data.c:2327:5: error: label ‘next_page’ used but not defined
>      goto next_page;

Thank you for the fix. This was actually introduced by the recent testing patch.

https://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git/commit/?h=dev&id=ff963ad2bf54460431f517b5cae473997a29bf2a

If you don't mind, please let me integrate this into the original patch.
Let me know.

Thanks,

> 
> Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
> Cc: Jaegeuk Kim <jaegeuk@kernel.org>
> Cc: Chao Yu <yuchao0@huawei.com>
> Cc: linux-f2fs-devel@lists.sourceforge.net
> ---
>  fs/f2fs/data.c |    2 --
>  1 file changed, 2 deletions(-)
> 
> --- linux-next-20200630.orig/fs/f2fs/data.c
> +++ linux-next-20200630/fs/f2fs/data.c
> @@ -2366,9 +2366,7 @@ set_error_page:
>  			zero_user_segment(page, 0, PAGE_SIZE);
>  			unlock_page(page);
>  		}
> -#ifdef CONFIG_F2FS_FS_COMPRESSION
>  next_page:
> -#endif
>  		if (rac)
>  			put_page(page);
>
Randy Dunlap June 30, 2020, 8:44 p.m. UTC | #2
On 6/30/20 1:23 PM, Jaegeuk Kim wrote:
> On 06/30, Randy Dunlap wrote:
>> From: Randy Dunlap <rdunlap@infradead.org>
>>
>> Fix build error when F2FS_FS_COMPRESSION is not set/enabled.
>> This label is needed in either case.
>>
>> ../fs/f2fs/data.c: In function ‘f2fs_mpage_readpages’:
>> ../fs/f2fs/data.c:2327:5: error: label ‘next_page’ used but not defined
>>      goto next_page;
> 
> Thank you for the fix. This was actually introduced by the recent testing patch.
> 
> https://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git/commit/?h=dev&id=ff963ad2bf54460431f517b5cae473997a29bf2a
> 
> If you don't mind, please let me integrate this into the original patch.
> Let me know.

Sure, no problem.

> Thanks,
> 
>>
>> Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
>> Cc: Jaegeuk Kim <jaegeuk@kernel.org>
>> Cc: Chao Yu <yuchao0@huawei.com>
>> Cc: linux-f2fs-devel@lists.sourceforge.net
>> ---
>>  fs/f2fs/data.c |    2 --
>>  1 file changed, 2 deletions(-)
>>
>> --- linux-next-20200630.orig/fs/f2fs/data.c
>> +++ linux-next-20200630/fs/f2fs/data.c
>> @@ -2366,9 +2366,7 @@ set_error_page:
>>  			zero_user_segment(page, 0, PAGE_SIZE);
>>  			unlock_page(page);
>>  		}
>> -#ifdef CONFIG_F2FS_FS_COMPRESSION
>>  next_page:
>> -#endif
>>  		if (rac)
>>  			put_page(page);
>>
diff mbox series

Patch

--- linux-next-20200630.orig/fs/f2fs/data.c
+++ linux-next-20200630/fs/f2fs/data.c
@@ -2366,9 +2366,7 @@  set_error_page:
 			zero_user_segment(page, 0, PAGE_SIZE);
 			unlock_page(page);
 		}
-#ifdef CONFIG_F2FS_FS_COMPRESSION
 next_page:
-#endif
 		if (rac)
 			put_page(page);