[PATCH 1/4] erofs-utils: lib: unexport "erofs/compress.h"
Gao Xiang
hsiangkao at linux.alibaba.com
Tue Sep 23 16:28:45 AEST 2025
It shouldn't be used by external users directly.
Signed-off-by: Gao Xiang <hsiangkao at linux.alibaba.com>
---
dump/main.c | 3 +--
fsck/main.c | 2 +-
lib/Makefile.am | 2 +-
lib/compress.c | 2 +-
lib/fragments.c | 2 +-
lib/inode.c | 2 +-
.../erofs/compress.h => lib/liberofs_compress.h | 17 ++++-------------
mkfs/main.c | 12 ++++++------
8 files changed, 16 insertions(+), 26 deletions(-)
rename include/erofs/compress.h => lib/liberofs_compress.h (80%)
diff --git a/dump/main.c b/dump/main.c
index b818a4a..58d489c 100644
--- a/dump/main.c
+++ b/dump/main.c
@@ -13,12 +13,11 @@
#include "erofs/print.h"
#include "erofs/inode.h"
#include "erofs/dir.h"
-#include "erofs/compress.h"
#include "erofs/fragments.h"
+#include "../lib/liberofs_compress.h"
#include "../lib/liberofs_private.h"
#include "../lib/liberofs_uuid.h"
-
struct erofsdump_cfg {
unsigned int totalshow;
bool show_inode;
diff --git a/fsck/main.c b/fsck/main.c
index 505c631..a1cb0cd 100644
--- a/fsck/main.c
+++ b/fsck/main.c
@@ -11,11 +11,11 @@
#include <sys/stat.h>
#include <sys/xattr.h>
#include "erofs/print.h"
-#include "erofs/compress.h"
#include "erofs/decompress.h"
#include "erofs/dir.h"
#include "erofs/xattr.h"
#include "../lib/compressor.h"
+#include "../lib/liberofs_compress.h"
#include "erofs/fragments.h"
static int erofsfsck_check_inode(erofs_nid_t pnid, erofs_nid_t nid);
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 72aa0e8..7487433 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -4,7 +4,6 @@ noinst_LTLIBRARIES = liberofs.la
noinst_HEADERS = $(top_srcdir)/include/erofs_fs.h \
$(top_srcdir)/include/erofs/blobchunk.h \
$(top_srcdir)/include/erofs/block_list.h \
- $(top_srcdir)/include/erofs/compress.h \
$(top_srcdir)/include/erofs/config.h \
$(top_srcdir)/include/erofs/decompress.h \
$(top_srcdir)/include/erofs/defs.h \
@@ -29,6 +28,7 @@ noinst_HEADERS = $(top_srcdir)/include/erofs_fs.h \
$(top_srcdir)/include/erofs/importer.h \
$(top_srcdir)/lib/liberofs_base64.h \
$(top_srcdir)/lib/liberofs_cache.h \
+ $(top_srcdir)/lib/liberofs_compress.h \
$(top_srcdir)/lib/liberofs_private.h \
$(top_srcdir)/lib/liberofs_xxhash.h \
$(top_srcdir)/lib/liberofs_gzran.h \
diff --git a/lib/compress.c b/lib/compress.c
index dd537ec..8266c56 100644
--- a/lib/compress.c
+++ b/lib/compress.c
@@ -15,7 +15,6 @@
#include <stdlib.h>
#include <unistd.h>
#include "erofs/print.h"
-#include "erofs/compress.h"
#include "erofs/dedupe.h"
#include "compressor.h"
#include "erofs/block_list.h"
@@ -25,6 +24,7 @@
#include "erofs/workqueue.h"
#endif
#include "liberofs_cache.h"
+#include "liberofs_compress.h"
#include "liberofs_metabox.h"
#define Z_EROFS_DESTBUF_SZ (Z_EROFS_PCLUSTER_MAX_SIZE + EROFS_MAX_BLOCK_SIZE * 2)
diff --git a/lib/fragments.c b/lib/fragments.c
index 5e93f48..6a30785 100644
--- a/lib/fragments.c
+++ b/lib/fragments.c
@@ -14,13 +14,13 @@
#include <sys/mman.h>
#include "erofs/err.h"
#include "erofs/inode.h"
-#include "erofs/compress.h"
#include "erofs/print.h"
#include "erofs/internal.h"
#include "erofs/fragments.h"
#include "erofs/bitops.h"
#include "erofs/lock.h"
#include "erofs/importer.h"
+#include "liberofs_compress.h"
#include "liberofs_private.h"
#ifdef HAVE_SYS_SENDFILE_H
#include <sys/sendfile.h>
diff --git a/lib/inode.c b/lib/inode.c
index 0811c97..fef7128 100644
--- a/lib/inode.c
+++ b/lib/inode.c
@@ -19,7 +19,6 @@
#include "erofs/lock.h"
#include "erofs/diskbuf.h"
#include "erofs/inode.h"
-#include "erofs/compress.h"
#include "erofs/xattr.h"
#include "erofs/exclude.h"
#include "erofs/block_list.h"
@@ -28,6 +27,7 @@
#include "erofs/fragments.h"
#include "erofs/importer.h"
#include "liberofs_cache.h"
+#include "liberofs_compress.h"
#include "liberofs_private.h"
#include "liberofs_metabox.h"
diff --git a/include/erofs/compress.h b/lib/liberofs_compress.h
similarity index 80%
rename from include/erofs/compress.h
rename to lib/liberofs_compress.h
index 00e7715..907c6d4 100644
--- a/include/erofs/compress.h
+++ b/lib/liberofs_compress.h
@@ -2,17 +2,12 @@
/*
* Copyright (C) 2019 HUAWEI, Inc.
* http://www.huawei.com/
- * Created by Gao Xiang <xiang at kernel.org>
+ * Copyright (C) 2025 Alibaba Cloud
*/
-#ifndef __EROFS_COMPRESS_H
-#define __EROFS_COMPRESS_H
+#ifndef __EROFS_LIB_LIBEROFS_COMPRESS_H
+#define __EROFS_LIB_LIBEROFS_COMPRESS_H
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
-#include "internal.h"
+#include "erofs/internal.h"
#define EROFS_CONFIG_COMPR_MAX_SZ (4000 * 1024)
#define Z_EROFS_COMPR_QUEUE_SZ (EROFS_CONFIG_COMPR_MAX_SZ * 2)
@@ -29,8 +24,4 @@ int z_erofs_compress_exit(struct erofs_sb_info *sbi);
const char *z_erofs_list_supported_algorithms(int i, unsigned int *mask);
const struct erofs_algorithm *z_erofs_list_available_compressors(int *i);
-#ifdef __cplusplus
-}
-#endif
-
#endif
diff --git a/mkfs/main.c b/mkfs/main.c
index 50e2bdb..9703d8c 100644
--- a/mkfs/main.c
+++ b/mkfs/main.c
@@ -19,7 +19,6 @@
#include "erofs/diskbuf.h"
#include "erofs/inode.h"
#include "erofs/tar.h"
-#include "erofs/compress.h"
#include "erofs/dedupe.h"
#include "erofs/xattr.h"
#include "erofs/exclude.h"
@@ -28,13 +27,14 @@
#include "erofs/blobchunk.h"
#include "erofs/fragments.h"
#include "erofs/rebuild.h"
-#include "../lib/liberofs_private.h"
-#include "../lib/liberofs_uuid.h"
+#include "../lib/compressor.h"
+#include "../lib/liberofs_compress.h"
+#include "../lib/liberofs_gzran.h"
#include "../lib/liberofs_metabox.h"
-#include "../lib/liberofs_s3.h"
#include "../lib/liberofs_oci.h"
-#include "../lib/liberofs_gzran.h"
-#include "../lib/compressor.h"
+#include "../lib/liberofs_private.h"
+#include "../lib/liberofs_s3.h"
+#include "../lib/liberofs_uuid.h"
static struct option long_options[] = {
{"version", no_argument, 0, 'V'},
--
2.43.5
More information about the Linux-erofs
mailing list