aboutsummaryrefslogtreecommitdiff
path: root/bin
diff options
context:
space:
mode:
authorDavid Oberhollenzer <david.oberhollenzer@sigma-star.at>2023-03-04 21:28:14 +0100
committerDavid Oberhollenzer <david.oberhollenzer@sigma-star.at>2023-04-01 12:25:02 +0200
commit32eb57dd9a19254565a0792ab9b627a3dac319f9 (patch)
treec86314fda1e36f2231f352ec0f372aef7d3d9b0a /bin
parent6b1020ef3e034cbb6e0fa4cd984b181c0dd414ff (diff)
libsquashfs: remove the default block writer alignment feature
The idea of the block align feature was to allow micro-managing that some files are forcefully aligned to 1k/4k ("device block") boundaries, hoping to improve access time at the cost of data density. The feature was not exposed in the tools for a long time and eventuall added to the sort file. Measurement and experimentation showed, that it in fact worsened the read performance on a test system with an old micro SD card as the bottle neck. The feature is removed, and if needed, can be brought back simply by wrapping/sub-classing the default block writer, if need be.. Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at>
Diffstat (limited to 'bin')
-rw-r--r--bin/gensquashfs/src/sort_by_file.c3
-rw-r--r--bin/gensquashfs/test/sort_file.c4
2 files changed, 2 insertions, 5 deletions
diff --git a/bin/gensquashfs/src/sort_by_file.c b/bin/gensquashfs/src/sort_by_file.c
index a555718..bc89c39 100644
--- a/bin/gensquashfs/src/sort_by_file.c
+++ b/bin/gensquashfs/src/sort_by_file.c
@@ -159,9 +159,6 @@ static int decode_flags(const char *filename, size_t line_no, bool *do_glob,
} else if (strncmp(line, "dont_fragment", 13) == 0) {
line += 13;
(*flags) |= SQFS_BLK_DONT_FRAGMENT;
- } else if (strncmp(line, "align", 5) == 0) {
- line += 5;
- (*flags) |= SQFS_BLK_ALIGN;
} else if (strncmp(line, "dont_compress", 13) == 0) {
line += 13;
(*flags) |= SQFS_BLK_DONT_COMPRESS;
diff --git a/bin/gensquashfs/test/sort_file.c b/bin/gensquashfs/test/sort_file.c
index 951328e..6c6cce6 100644
--- a/bin/gensquashfs/test/sort_file.c
+++ b/bin/gensquashfs/test/sort_file.c
@@ -42,7 +42,7 @@ static const char *sort_file =
" 50 [glob] /bin/*\n"
"\n"
"# Make this file appear first\n"
-" -10000 [dont_compress,dont_fragment,align] /usr/share/bla.txt";
+" -10000 [dont_compress,dont_fragment] /usr/share/bla.txt";
static const char *initial_order[] = {
"bin/chmod",
@@ -93,7 +93,7 @@ static sqfs_s64 priorities[] = {
};
static int flags[] = {
- SQFS_BLK_DONT_COMPRESS | SQFS_BLK_ALIGN | SQFS_BLK_DONT_FRAGMENT,
+ SQFS_BLK_DONT_COMPRESS | SQFS_BLK_DONT_FRAGMENT,
0,
0,
0,