diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2023-11-02 20:53:57 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2023-11-02 20:53:57 +0300 |
| commit | 87a201b43bbe14ddf8dc2d73fa15741b7403afc3 (patch) | |
| tree | b3e3bae5d367d923923954492d857ef1e187966b /fs/erofs/data.c | |
| parent | 57aff997450420b8a7da6a72f45c3677ac1c2f86 (diff) | |
| parent | 1a0ac8bd7a4fa5b2f4ef14c3b1e9d6e5a5faae06 (diff) | |
| download | linux-87a201b43bbe14ddf8dc2d73fa15741b7403afc3.tar.xz | |
Merge tag 'erofs-for-6.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs
Pull erofs updates from Gao Xiang:
"Nothing exciting lands for this cycle, since we're still busying in
developing support for sub-page blocks and large-folios of compressed
data for new scenarios on Android.
In this cycle, MicroLZMA format is marked as stable, and there are
minor cleanups around documentation and codebase. In addition, it also
fixes incorrect lockref usage in erofs_insert_workgroup().
Summary:
- Fix inode metadata space layout documentation
- Avoid warning for MicroLZMA format anymore
- Fix erofs_insert_workgroup() lockref usage
- Some cleanups"
* tag 'erofs-for-6.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs:
erofs: fix erofs_insert_workgroup() lockref usage
erofs: tidy up redundant includes
erofs: get rid of ROOT_NID()
erofs: simplify compression configuration parser
erofs: don't warn MicroLZMA format anymore
erofs: fix inode metadata space layout description in documentation
Diffstat (limited to 'fs/erofs/data.c')
| -rw-r--r-- | fs/erofs/data.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/fs/erofs/data.c b/fs/erofs/data.c index f6a0a1748521..029c761670bf 100644 --- a/fs/erofs/data.c +++ b/fs/erofs/data.c @@ -5,9 +5,7 @@ * Copyright (C) 2021, Alibaba Cloud */ #include "internal.h" -#include <linux/prefetch.h> #include <linux/sched/mm.h> -#include <linux/dax.h> #include <trace/events/erofs.h> void erofs_unmap_metabuf(struct erofs_buf *buf) |