linux-kernel - [PATCH] f2fs: fix stubs when F2FS_FS

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-Id: <20220614171526.31756-1-rdunlap@infradead.org>
Date:   Tue, 14 Jun 2022 10:15:26 -0700
From:   Randy Dunlap <rdunlap@...radead.org>
To:     linux-kernel@...r.kernel.org
Cc:     Randy Dunlap <rdunlap@...radead.org>,
        Daeho Jeong <daehojeong@...gle.com>,
        Jaegeuk Kim <jaegeuk@...nel.org>, Chao Yu <chao@...nel.org>,
        linux-f2fs-devel@...ts.sourceforge.net
Subject: [PATCH] f2fs: fix stubs when F2FS_FS_COMPRESSION is not enabled

Fix build errors when F2FS_FS_COMPRESSION is not set:

../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,
                    ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~

../fs/f2fs/data.c: In function ‘f2fs_finish_read_bio’:
../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:4234:20: note: declared here
 static inline void f2fs_put_page_dic(struct page *page)
                    ^~~~~~~~~~~~~~~~~

Fixes: 1b565702dffe ("f2fs: handle decompress only post processing in softirq")
Signed-off-by: Randy Dunlap <rdunlap@...radead.org>
Cc: Daeho Jeong <daehojeong@...gle.com>
Cc: Jaegeuk Kim <jaegeuk@...nel.org>
Cc: Chao Yu <chao@...nel.org>
Cc: linux-f2fs-devel@...ts.sourceforge.net
---
 fs/f2fs/f2fs.h |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

--- a/fs/f2fs/f2fs.h
+++ b/fs/f2fs/f2fs.h
@@ -4226,11 +4226,12 @@ static inline int f2fs_init_compress_mem
 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)
+						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);
 }