[PATCH v2] erofs-utils: add "noinline_data" extended option
Gao Xiang
hsiangkao at linux.alibaba.com
Mon Jul 5 13:30:08 AEST 2021
Don't inline regular files in order to add preliminary
DAX feature support.
Signed-off-by: Gao Xiang <hsiangkao at linux.alibaba.com>
---
v2:
- update the prefix of the patch subject.
include/erofs/config.h | 1 +
lib/inode.c | 5 +++++
mkfs/main.c | 6 ++++++
3 files changed, 12 insertions(+)
diff --git a/include/erofs/config.h b/include/erofs/config.h
index 67e7a0fed24c..8124f3b36baf 100644
--- a/include/erofs/config.h
+++ b/include/erofs/config.h
@@ -44,6 +44,7 @@ struct erofs_configure {
bool c_random_pclusterblks;
#endif
char c_timeinherit;
+ bool c_noinline_data;
#ifdef HAVE_LIBSELINUX
struct selabel_handle *sehnd;
diff --git a/lib/inode.c b/lib/inode.c
index 97f0cf763baf..38906370f533 100644
--- a/lib/inode.c
+++ b/lib/inode.c
@@ -562,6 +562,11 @@ static int erofs_prepare_inode_buffer(struct erofs_inode *inode)
if (is_inode_layout_compression(inode))
goto noinline;
+ if (cfg.c_noinline_data && S_ISREG(inode->i_mode)) {
+ inode->datalayout = EROFS_INODE_FLAT_PLAIN;
+ goto noinline;
+ }
+
/*
* if the file size is block-aligned for uncompressed files,
* should use EROFS_INODE_FLAT_PLAIN data mapping mode.
diff --git a/mkfs/main.c b/mkfs/main.c
index 28539da5ea5f..10fe14d7a722 100644
--- a/mkfs/main.c
+++ b/mkfs/main.c
@@ -161,6 +161,12 @@ static int parse_extended_opts(const char *opts)
return -EINVAL;
erofs_sb_clear_sb_chksum();
}
+
+ if (MATCH_EXTENTED_OPT("noinline_data", token, keylen)) {
+ if (vallen)
+ return -EINVAL;
+ cfg.c_noinline_data = true;
+ }
}
return 0;
}
--
2.24.4
More information about the Linux-erofs
mailing list