Skip to content

Commit f153fbe

Browse files
committed
Merge tag 'erofs-for-6.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs
Pull erofs updates from Gao Xiang: "In this cycle, we introduce compressed inode support over fscache since a lot of native EROFS images are explicitly compressed so that EROFS over fscache can be more widely used even without Dragonfly Nydus [1]. Apart from that, there are some folio conversions for compressed inodes available as well as a lockdep false positive fix. Summary: - Some folio conversions for compressed inodes; - Add compressed inode support over fscache; - Fix lockdep false positives of erofs_pseudo_mnt" Link: https://nydus.dev [1] * tag 'erofs-for-6.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs: erofs: support compressed inodes over fscache erofs: make iov_iter describe target buffers over fscache erofs: fix lockdep false positives on initializing erofs_pseudo_mnt erofs: refine managed cache operations to folios erofs: convert z_erofs_submissionqueue_endio() to folios erofs: convert z_erofs_fill_bio_vec() to folios erofs: get rid of `justfound` debugging tag erofs: convert z_erofs_do_read_page() to folios erofs: convert z_erofs_onlinepage_.* to folios
2 parents d453cc5 + a1bafc3 commit f153fbe

File tree

9 files changed

+335
-317
lines changed

9 files changed

+335
-317
lines changed

fs/erofs/compress.h

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -81,13 +81,6 @@ static inline bool z_erofs_put_shortlivedpage(struct page **pagepool,
8181
return true;
8282
}
8383

84-
#define MNGD_MAPPING(sbi) ((sbi)->managed_cache->i_mapping)
85-
static inline bool erofs_page_is_managed(const struct erofs_sb_info *sbi,
86-
struct page *page)
87-
{
88-
return page->mapping == MNGD_MAPPING(sbi);
89-
}
90-
9184
int z_erofs_fixup_insize(struct z_erofs_decompress_req *rq, const char *padbuf,
9285
unsigned int padbufsize);
9386
extern const struct z_erofs_decompressor erofs_decompressors[];

fs/erofs/decompressor_deflate.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -212,9 +212,6 @@ int z_erofs_deflate_decompress(struct z_erofs_decompress_req *rq,
212212

213213
if (rq->out[no] != rq->in[j])
214214
continue;
215-
216-
DBG_BUGON(erofs_page_is_managed(EROFS_SB(sb),
217-
rq->in[j]));
218215
tmppage = erofs_allocpage(pgpl, rq->gfp);
219216
if (!tmppage) {
220217
err = -ENOMEM;

fs/erofs/decompressor_lzma.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -258,9 +258,6 @@ int z_erofs_lzma_decompress(struct z_erofs_decompress_req *rq,
258258

259259
if (rq->out[no] != rq->in[j])
260260
continue;
261-
262-
DBG_BUGON(erofs_page_is_managed(EROFS_SB(rq->sb),
263-
rq->in[j]));
264261
tmppage = erofs_allocpage(pgpl, rq->gfp);
265262
if (!tmppage) {
266263
err = -ENOMEM;

0 commit comments

Comments
 (0)