Re: [PATCH -next] f2fs: fix build error too many arguments to functions

[Jaegeuk Kim]

Thanks, but I deqeued the buggy patch, so expect to get the right change
later.

On 06/15, Ren Zhijie wrote:
> If CONFIG_F2FS_FS_COMPRESSION is not set.
> 
> make ARCH=x86_64 CROSS_COMPILE=x86_64-linux-gnu-, will be failed, like this:
> fs/f2fs/data.c: In function ‘f2fs_finish_read_bio’:
> fs/f2fs/data.c:136:5: error: too many arguments to function ‘f2fs_end_read_compressed_page’
>      f2fs_end_read_compressed_page(page, true, 0,
>      ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> In file included from fs/f2fs/data.c:25:0:
> fs/f2fs/f2fs.h:4228:20: note: declared here
>  static inline void f2fs_end_read_compressed_page(struct page *page,
>                     ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> fs/f2fs/data.c:138:4: error: too many arguments to function ‘f2fs_put_page_dic’
>     f2fs_put_page_dic(page, in_softirq);
>     ^~~~~~~~~~~~~~~~~
> In file included from fs/f2fs/data.c:25:0:
> fs/f2fs/f2fs.h:4233:20: note: declared here
>  static inline void f2fs_put_page_dic(struct page *page)
>                     ^~~~~~~~~~~~~~~~~
> fs/f2fs/data.c: In function ‘f2fs_handle_step_decompress’:
> fs/f2fs/data.c:241:4: error: too many arguments to function ‘f2fs_end_read_compressed_page’
>     f2fs_end_read_compressed_page(page, PageError(page),
>     ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> In file included from fs/f2fs/data.c:25:0:
> fs/f2fs/f2fs.h:4228:20: note: declared here
>  static inline void f2fs_end_read_compressed_page(struct page *page,
>                     ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> make[2]: *** [fs/f2fs/data.o] Error 1
> make[2]: *** Waiting for unfinished jobs....
> make[1]: *** [fs/f2fs] Error 2
> 
> Since commit 1b565702dffe ("f2fs: handle decompress only post processing in softirq") 
> had changed the definition of function "f2fs_end_read_compressed_page()" and "f2fs_put_page_dic()",
> but forgot the other definitions in f2fs.h warpped by #else /* CONFIG_F2FS_FS_COMPRESSION */.
> 
> Reported-by: Hulk Robot <hulkci@xxxxxxxxxx>
> Fixes: 1b565702dffe("f2fs: handle decompress only post processing in softirq")
> Signed-off-by: Ren Zhijie <renzhijie2@xxxxxxxxxx>
> ---
>  fs/f2fs/f2fs.h | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h
> index b42fcca030e2..0811a9335dde 100644
> --- a/fs/f2fs/f2fs.h
> +++ b/fs/f2fs/f2fs.h
> @@ -4225,12 +4225,12 @@ static inline struct page *f2fs_compress_control_page(struct page *page)
>  static inline int f2fs_init_compress_mempool(void) { return 0; }
>  static inline void f2fs_destroy_compress_mempool(void) { }
>  static inline void f2fs_decompress_cluster(struct decompress_io_ctx *dic) { }
> -static inline void f2fs_end_read_compressed_page(struct page *page,
> -						bool failed, block_t blkaddr)
> +static inline void f2fs_end_read_compressed_page(struct page *page, bool failed,
> +				block_t blkaddr, bool in_softirq)
>  {
>  	WARN_ON_ONCE(1);
>  }
> -static inline void f2fs_put_page_dic(struct page *page)
> +static inline void f2fs_put_page_dic(struct page *page, bool in_softirq)
>  {
>  	WARN_ON_ONCE(1);
>  }
> -- 
> 2.17.1