Skip to contentSkip to conversation

erofs-utils: introduce fuse implementation

PATCH New Gao Xiang via Linux-erofs 1 participant 13 messages Nov 14, 2020 1 message not in the archive

Subsystems (2)
lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

#1 lore raw

v4 cover erofs-utils: introduce fuse implementation

Hi,

v3: https://lore.kernel.org/r/[email protected]
v2: https://lore.kernel.org/r/[email protected]

background & v1:
https://lore.kernel.org/r/[email protected]

All main logic has been cleaned up. Send out delta patches this round. As the next step, will form the formal patchset for this simple erofsfuse feature.

Thanks,
Gao Xiang

Gao Xiang (9):
erofs-utils: fuse: clean up path walking
erofs: clean up compress data read
erofs-utils: fuse: get rid of erofs_vnode
erofs-utils: fuse: move namei.c to lib/
erofs-utils: fuse: kill read.c
erofs-utils: fuse: clean up readdir
erofs-utils: fuse: rename readir.c to dir.c
erofs-utils: fuse: cleanup main.c
erofs-utils: fuse: fix up configure.ac / Makefile.am

Huang Jianan (2):
erofs-utils: fuse: add special file support
erofs-utils: fuse: add compressed file support

Li Guifu (1):
erofs-utils: introduce fuse implementation

 Makefile.am                |   4 +
 README                     |  28 ++-
 configure.ac               |  22 +-
 fuse/Makefile.am           |  10 +
 fuse/dir.c                 | 104 ++++++++++
 fuse/main.c                | 222 ++++++++++++++++++++
 include/erofs/decompress.h |  35 ++++
 include/erofs/defs.h       |  16 ++
 include/erofs/internal.h   |  87 +++++++-
 include/erofs/io.h         |   1 +
 include/erofs_fs.h         |   4 +
 lib/Makefile.am            |   4 +-
 lib/data.c                 | 206 ++++++++++++++++++
 lib/decompress.c           |  87 ++++++++
 lib/io.c                   |  16 ++
 lib/namei.c                | 205 ++++++++++++++++++
 lib/zmap.c                 | 415 +++++++++++++++++++++++++++++++++++++
 17 files changed, 1461 insertions(+), 5 deletions(-)
 create mode 100644 fuse/Makefile.am
 create mode 100644 fuse/dir.c
 create mode 100644 fuse/main.c
 create mode 100644 include/erofs/decompress.h
 create mode 100644 lib/data.c
 create mode 100644 lib/decompress.c
 create mode 100644 lib/namei.c
 create mode 100644 lib/zmap.c
Signature · 1 line
2.24.0
#2 lore raw

PATCH v4 1/12 erofs-utils: introduce fuse implementation

From: Li Guifu <[email protected]>

Let's add erofsfuse approach, and benefits are:

- images can be supported on various platforms;
- new unpack tool can be developed based on this;
- new on-disk features can be iterated, verified effectively.

This commit only aims at reading a regular file.
Other file (e.g. compressed file) support is out of scope for now.

---
 Makefile.am              |   2 +-
 README                   |  28 ++++-
 configure.ac             |   3 +-
 fuse/Makefile.am         |  14 +++
 fuse/main.c              | 203 +++++++++++++++++++++++++++++++++++
 fuse/namei.c             | 222 +++++++++++++++++++++++++++++++++++++++
 fuse/namei.h             |  17 +++
 fuse/read.c              |  72 +++++++++++++
 fuse/read.h              |  16 +++
 fuse/readir.c            | 121 +++++++++++++++++++++
 fuse/readir.h            |  17 +++
 include/erofs/defs.h     |   3 +
 include/erofs/internal.h |  83 +++++++++++++++
 include/erofs/io.h       |   1 +
 lib/Makefile.am          |   4 +-
 lib/data.c               | 117 +++++++++++++++++++++
 lib/io.c                 |  16 +++
 17 files changed, 934 insertions(+), 5 deletions(-)
 create mode 100644 fuse/Makefile.am
 create mode 100644 fuse/main.c
 create mode 100644 fuse/namei.c
 create mode 100644 fuse/namei.h
 create mode 100644 fuse/read.c
 create mode 100644 fuse/read.h
 create mode 100644 fuse/readir.c
 create mode 100644 fuse/readir.h
 create mode 100644 lib/data.c
Makefile.am +1 -1
index 1d20577068c5..24f4a7b3d5ad 100644
@@ -3,4 +3,4 @@
 
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = man lib mkfs
+SUBDIRS = man lib mkfs fuse
README +27 -1
index 5addd6b80e04..870858c48b7d 100644
@@ -2,7 +2,8 @@ erofs-utils
 ===========
 
 erofs-utils includes user-space tools for erofs filesystem images.
-Currently only mkfs.erofs is available.
+One is mkfs.erofs to create a image, the other is erofsfuse which
+is used to mount a image on a directory
 
 mkfs.erofs
 ----------
@@ -95,6 +96,31 @@ It may still be useful since new erofs-utils has not been widely used in
 commercial products. However, if that happens, please report bug to us
 as well.
 
+erofs-utils: erofsfuse
+----------------------
+erofsfuse mount a erofs filesystem image created by mkfs.erofs to a directory, and then
+It can be listed, read files and so on.
+
+Dependencies
+~~~~~~~~~~~~
+FUSE library version: 2.9.7
+fusermount version: 2.9.7
+using FUSE kernel interface version 7.19
+
+How to installed fuse
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+sudo apt-get update
+sudo apt-get install -y fuse libfuse-dev
+
+How to build erofsfuse
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+	$ ./autogen.sh
+	$ ./configure
+	$ make
+
+erofsfuse binary will be generated under fuse folder.
+
 Contribution
 ------------
 
configure.ac +2 -1
index bff1e293789a..e6d2e5fd3702 100644
@@ -247,6 +247,7 @@ AC_SUBST([liblz4_LIBS])
 AC_CONFIG_FILES([Makefile
 		 man/Makefile
 		 lib/Makefile
-		 mkfs/Makefile])
+		 mkfs/Makefile
+		 fuse/Makefile])
 AC_OUTPUT
 
fuse/Makefile.am new file +14 -0
new file mode 100644
index 000000000000..0c1a24763f59
@@ -0,0 +1,14 @@
+# SPDX-License-Identifier: GPL-2.0+
+# Makefile.am
+
+AUTOMAKE_OPTIONS = foreign
+bin_PROGRAMS     = erofsfuse
+erofsfuse_SOURCES = main.c namei.c read.c readir.c
+erofsfuse_CFLAGS = -Wall -Werror \
+                   -I$(top_srcdir)/include \
+                   $(shell pkg-config fuse --cflags) \
+                   -DFUSE_USE_VERSION=26 \
+                   -std=gnu99
+LDFLAGS += $(shell pkg-config fuse --libs)
+erofsfuse_LDADD = $(top_builddir)/lib/liberofs.la -ldl
+
fuse/main.c new file +203 -0

203 lines not on this page · raw message

fuse/namei.c new file +222 -0

222 lines not on this page · raw message

fuse/namei.h new file +17 -0
new file mode 100644
index 000000000000..2625ec58d434
@@ -0,0 +1,17 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+/*
+ * erofs-utils/fuse/inode.h
+ *
+ * Created by Li Guifu <[email protected]>
+ */
+#ifndef __INODE_H
+#define __INODE_H
+
+#include "erofs/internal.h"
+#include "erofs_fs.h"
+
+int erofs_iget_by_path(const char *path, struct erofs_vnode *v);
+int erofs_iget_by_nid(erofs_nid_t nid, struct erofs_vnode *v);
+int walk_path(const char *path, erofs_nid_t *out_nid);
+
+#endif
fuse/read.c new file +72 -0

72 lines not on this page · raw message

fuse/read.h new file +16 -0
new file mode 100644
index 000000000000..3f4af1495510
@@ -0,0 +1,16 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+/*
+ * erofs-utils/fuse/read.h
+ *
+ * Created by Li Guifu <[email protected]>
+ */
+#ifndef __EROFS_READ_H
+#define __EROFS_READ_H
+
+#include <fuse.h>
+#include <fuse_opt.h>
+
+int erofs_read(const char *path, char *buffer, size_t size, off_t offset,
+	    struct fuse_file_info *fi);
+
+#endif
fuse/readir.c new file +121 -0

121 lines not on this page · raw message

fuse/readir.h new file +17 -0
new file mode 100644
index 000000000000..ee2ab8bdd0f0
@@ -0,0 +1,17 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+/*
+ * erofs-utils/fuse/readir.h
+ *
+ * Created by Li Guifu <[email protected]>
+ */
+#ifndef __EROFS_READDIR_H
+#define __EROFS_READDIR_H
+
+#include <fuse.h>
+#include <fuse_opt.h>
+
+int erofs_readdir(const char *path, void *buffer, fuse_fill_dir_t filler,
+	       off_t offset, struct fuse_file_info *fi);
+
+
+#endif
include/erofs/defs.h +3 -0
index 8dee661ab9f0..e97de36aa04b 100644
@@ -24,6 +24,9 @@
 #ifdef HAVE_LINUX_TYPES_H
 #include <linux/types.h>
 #endif
+#ifndef UNUSED
+#define UNUSED(_X)    ((void) _X)
+#endif
 
 /*
  * container_of - cast a member of a structure out to the containing structure
include/erofs/internal.h +83 -0

121 lines not on this page · raw message

include/erofs/io.h +1 -0
index a23de64541c6..557424578ece 100644
@@ -17,6 +17,7 @@
 #endif
 
 int dev_open(const char *devname);
+int dev_open_ro(const char *dev);
 void dev_close(void);
 int dev_write(const void *buf, u64 offset, size_t len);
 int dev_read(void *buf, u64 offset, size_t len);
lib/Makefile.am +2 -2
index e4b51e65f053..22bd73255d04 100644
@@ -2,8 +2,8 @@
 # Makefile.am
 
 noinst_LTLIBRARIES = liberofs.la
-liberofs_la_SOURCES = config.c io.c cache.c inode.c xattr.c \
-		      compress.c compressor.c exclude.c
+liberofs_la_SOURCES = config.c io.c cache.c super.c inode.c xattr.c exclude.c \
+		      data.c compress.c compressor.c
 liberofs_la_CFLAGS = -Wall -Werror -I$(top_srcdir)/include
 if ENABLE_LZ4
 liberofs_la_CFLAGS += ${LZ4_CFLAGS}
lib/data.c new file +117 -0

117 lines not on this page · raw message

lib/io.c +16 -0
index 4f5d9a6edaa4..d835f34da50f 100644
@@ -108,6 +108,22 @@ int dev_open(const char *dev)
 	return 0;
 }
 
+/* XXX: temporary soluation. Disk I/O implementation needs to be refactored. */
+int dev_open_ro(const char *dev)
+{
+	int fd = open(dev, O_RDONLY | O_BINARY);
+
+	if (fd < 0) {
+		erofs_err("failed to open(%s).", dev);
+		return -errno;
+	}
+
+	erofs_devfd = fd;
+	erofs_devname = dev;
+	erofs_devsz = INT64_MAX;
+	return 0;
+}
+
 u64 dev_length(void)
 {
 	return erofs_devsz;
Signature · 1 line
2.24.0
#3 lore raw

PATCH v4 2/12 erofs-utils: fuse: add special file support

In reply to Gao Xiang via Linux-erofs

From: Huang Jianan <[email protected]>

---
 fuse/main.c              |  2 ++
 fuse/namei.c             | 14 ++++++++++----
 fuse/read.c              | 26 ++++++++++++++++++++++++++
 fuse/read.h              |  1 +
 include/erofs/internal.h |  1 +
 5 files changed, 40 insertions(+), 4 deletions(-)
fuse/main.c +2 -0
index 5121e8325f32..563b2c378952 100644
@@ -146,6 +146,7 @@ int erofs_getattr(const char *path, struct stat *stbuf)
 	stbuf->st_blocks = stbuf->st_size / EROFS_BLKSIZ;
 	stbuf->st_uid = v.i_uid;
 	stbuf->st_gid = v.i_gid;
+	stbuf->st_rdev = v.i_rdev;
 	stbuf->st_atime = sbi.build_time;
 	stbuf->st_mtime = sbi.build_time;
 	stbuf->st_ctime = sbi.build_time;
@@ -153,6 +154,7 @@ int erofs_getattr(const char *path, struct stat *stbuf)
 }
 
 static struct fuse_operations erofs_ops = {
+	.readlink = erofs_readlink,
 	.getattr = erofs_getattr,
 	.readdir = erofs_readdir,
 	.open = erofs_open,
fuse/namei.c +10 -4
index cd747ad1be56..e79e77d1e3c9 100644
@@ -11,6 +11,7 @@
 #include <stdio.h>
 #include <errno.h>
 #include <sys/stat.h>
+#include <sys/sysmacros.h>
 
 #include "erofs/defs.h"
 #include "erofs/print.h"
@@ -37,6 +38,13 @@ static uint8_t get_path_token_len(const char *path)
 	return len;
 }
 
+static inline dev_t new_decode_dev(u32 dev)
+{
+	unsigned major = (dev & 0xfff00) >> 8;
+	unsigned minor = (dev & 0xff) | ((dev >> 12) & 0xfff00);
+	return makedev(major, minor);
+}
+
 int erofs_iget_by_nid(erofs_nid_t nid, struct erofs_vnode *vi)
 {
 	int ret;
@@ -63,13 +71,11 @@ int erofs_iget_by_nid(erofs_nid_t nid, struct erofs_vnode *vi)
 	switch (vi->i_mode & S_IFMT) {
 	case S_IFBLK:
 	case S_IFCHR:
-		/* fixme: add special devices support
-		 * vi->i_rdev = new_decode_dev(le32_to_cpu(v1->i_u.rdev));
-		 */
+		vi->i_rdev = new_decode_dev(le32_to_cpu(v1->i_u.rdev));
 		break;
 	case S_IFIFO:
 	case S_IFSOCK:
-		/*fixme: vi->i_rdev = 0; */
+		vi->i_rdev = 0;
 		break;
 	case S_IFREG:
 	case S_IFLNK:
fuse/read.c +26 -0
index 446e0837cbc4..a55c0f2f78cd 100644
@@ -70,3 +70,29 @@ int erofs_read(const char *path, char *buffer, size_t size, off_t offset,
 	}
 }
 
+int erofs_readlink(const char *path, char *buffer, size_t size)
+{
+	int ret;
+	erofs_nid_t nid;
+	size_t lnksz;
+	struct erofs_vnode v;
+
+	ret = walk_path(path, &nid);
+	if (ret)
+		return ret;
+
+	ret = erofs_iget_by_nid(nid, &v);
+	if (ret)
+		return ret;
+
+	lnksz = min((size_t)v.i_size, size - 1);
+
+	ret = erofs_read(path, buffer, lnksz, 0, NULL);
+	buffer[lnksz] = '\0';
+	if (ret != (int)lnksz)
+		return ret;
+
+	erofs_info("path:%s link=%s size=%llu", path, buffer, (unsigned long long)lnksz);
+	return 0;
+}
+
fuse/read.h +1 -0
index 3f4af1495510..e901c607dc91 100644
@@ -12,5 +12,6 @@
 
 int erofs_read(const char *path, char *buffer, size_t size, off_t offset,
 	    struct fuse_file_info *fi);
+int erofs_readlink(const char *path, char *buffer, size_t size);
 
 #endif
include/erofs/internal.h +1 -0
index f9e757316efe..77fa8d82c746 100644
@@ -168,6 +168,7 @@ struct erofs_vnode {
 	uint16_t i_uid;
 	uint16_t i_gid;
 	uint16_t i_nlink;
+	uint32_t i_rdev;
 
 	/* if file is inline read inline data witch inode */
 	char *idata;
Signature · 1 line
2.24.0
#4 lore raw

PATCH v4 3/12 erofs-utils: fuse: add compressed file support

In reply to Gao Xiang via Linux-erofs

From: Huang Jianan <[email protected]>

---
 fuse/Makefile.am           |   4 +-
 fuse/namei.c               |  11 +-
 fuse/read.c                |  77 ++++++-
 fuse/zmap.c                | 417 +++++++++++++++++++++++++++++++++++++
 include/erofs/decompress.h |  35 ++++
 include/erofs/defs.h       |  13 ++
 include/erofs/internal.h   |  22 +-
 include/erofs_fs.h         |   4 +
 lib/Makefile.am            |   2 +-
 lib/decompress.c           |  87 ++++++++
 10 files changed, 666 insertions(+), 6 deletions(-)
 create mode 100644 fuse/zmap.c
 create mode 100644 include/erofs/decompress.h
 create mode 100644 lib/decompress.c
fuse/Makefile.am +2 -2
index 0c1a24763f59..84e5f834d6a4 100644
@@ -3,12 +3,12 @@
 
 AUTOMAKE_OPTIONS = foreign
 bin_PROGRAMS     = erofsfuse
-erofsfuse_SOURCES = main.c namei.c read.c readir.c
+erofsfuse_SOURCES = main.c namei.c read.c readir.c zmap.c
 erofsfuse_CFLAGS = -Wall -Werror \
                    -I$(top_srcdir)/include \
                    $(shell pkg-config fuse --cflags) \
                    -DFUSE_USE_VERSION=26 \
                    -std=gnu99
 LDFLAGS += $(shell pkg-config fuse --libs)
-erofsfuse_LDADD = $(top_builddir)/lib/liberofs.la -ldl
+erofsfuse_LDADD = $(top_builddir)/lib/liberofs.la -ldl ${LZ4_LIBS}
 
fuse/namei.c +10 -1
index e79e77d1e3c9..5ee3f8d2a4b6 100644
@@ -47,7 +47,7 @@ static inline dev_t new_decode_dev(u32 dev)
 
 int erofs_iget_by_nid(erofs_nid_t nid, struct erofs_vnode *vi)
 {
-	int ret;
+	int ret, ifmt;
 	char buf[EROFS_BLKSIZ];
 	struct erofs_inode_compact *v1;
 	const erofs_off_t addr = iloc(nid);
@@ -58,6 +58,11 @@ int erofs_iget_by_nid(erofs_nid_t nid, struct erofs_vnode *vi)
 		return -EIO;
 
 	v1 = (struct erofs_inode_compact *)buf;
+	/* fixme: support extended inode */
+	ifmt = le16_to_cpu(v1->i_format);
+	if (__inode_version(ifmt) != EROFS_INODE_LAYOUT_COMPACT)
+		return -EOPNOTSUPP;
+
 	vi->datalayout = __inode_data_mapping(le16_to_cpu(v1->i_format));
 	vi->inode_isize = sizeof(struct erofs_inode_compact);
 	vi->xattr_isize = erofs_xattr_ibody_size(v1->i_xattr_icount);
@@ -86,6 +91,10 @@ int erofs_iget_by_nid(erofs_nid_t nid, struct erofs_vnode *vi)
 		return -EIO;
 	}
 
+	vi->z_inited = false;
+	if (erofs_inode_is_data_compressed(vi->datalayout))
+		z_erofs_fill_inode(vi);
+
 	return 0;
 }
 
fuse/read.c +76 -1

101 lines not on this page · raw message

fuse/zmap.c new file +417 -0

417 lines not on this page · raw message

include/erofs/decompress.h new file +35 -0
new file mode 100644
index 000000000000..beaac359b21f
@@ -0,0 +1,35 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+/*
+ * erofs-utils/include/erofs/decompress.h
+ *
+ * Copyright (C), 2008-2020, OPPO Mobile Comm Corp., Ltd.
+ * Created by Huang Jianan <[email protected]>
+ */
+#ifndef __EROFS_DECOMPRESS_H
+#define __EROFS_DECOMPRESS_H
+
+#include "internal.h"
+
+enum {
+	Z_EROFS_COMPRESSION_SHIFTED = Z_EROFS_COMPRESSION_MAX,
+	Z_EROFS_COMPRESSION_RUNTIME_MAX
+};
+
+struct z_erofs_decompress_req {
+	char *in, *out;
+
+	/*
+	 * initial decompressed bytes that need to be skipped
+	 * when finally copying to output buffer
+	 */
+	unsigned int decodedskip;
+	unsigned int inputsize, decodedlength;
+
+	/* indicate the algorithm will be used for decompression */
+	unsigned int alg;
+	bool partial_decoding;
+};
+
+int z_erofs_decompress(struct z_erofs_decompress_req *rq);
+
+#endif
include/erofs/defs.h +13 -0
index e97de36aa04b..c42ca401a8ee 100644
@@ -173,5 +173,18 @@ typedef int64_t         s64;
 #define __maybe_unused      __attribute__((__unused__))
 #endif
 
+struct __una_u32 { u32 x; } __packed;
+
+static inline u32 __get_unaligned_cpu32(const void *p)
+{
+	const struct __una_u32 *ptr = (const struct __una_u32 *)p;
+	return ptr->x;
+}
+
+static inline u32 get_unaligned_le32(const void *p)
+{
+	return __get_unaligned_cpu32((const u8 *)p);
+}
+
 #endif
 
include/erofs/internal.h +21 -1
index 77fa8d82c746..fc28d82490a1 100644
@@ -36,6 +36,8 @@ typedef unsigned short umode_t;
 #error incompatible PAGE_SIZE is already defined
 #endif
 
+#define PAGE_MASK		(~(PAGE_SIZE-1))
+
 #define LOG_BLOCK_SIZE          (12)
 #define EROFS_BLKSIZ            (1U << LOG_BLOCK_SIZE)
 
@@ -160,7 +162,15 @@ struct erofs_vnode {
 	uint16_t xattr_shared_count;
 	char *xattr_shared_xattrs;
 
-	erofs_blk_t raw_blkaddr;
+	union {
+		erofs_blk_t raw_blkaddr;
+		struct {
+			uint16_t z_advise;
+			uint8_t  z_algorithmtype[2];
+			uint8_t  z_logical_clusterbits;
+			uint8_t  z_physical_clusterbits[2];
+		};
+	};
 	erofs_nid_t nid;
 	uint32_t i_ino;
 
@@ -170,6 +180,7 @@ struct erofs_vnode {
 	uint16_t i_nlink;
 	uint32_t i_rdev;
 
+	bool z_inited;
 	/* if file is inline read inline data witch inode */
 	char *idata;
 };
@@ -233,6 +244,10 @@ enum {
 #define EROFS_MAP_MAPPED	(1 << BH_Mapped)
 /* Located in metadata (could be copied from bd_inode) */
 #define EROFS_MAP_META		(1 << BH_Meta)
+/* The extent has been compressed */
+#define EROFS_MAP_ZIPPED	(1 << BH_Zipped)
+/* The length of extent is full */
+#define EROFS_MAP_FULL_MAPPED	(1 << BH_FullMapped)
 
 struct erofs_map_blocks {
 	char mpage[EROFS_BLKSIZ];
@@ -251,6 +266,11 @@ int erofs_read_superblock(void);
 int erofs_read_raw_data(struct erofs_inode *inode, char *buffer,
 			erofs_off_t offset, erofs_off_t size);
 
+/* zmap.c */
+int z_erofs_fill_inode(struct erofs_vnode *vi);
+int z_erofs_map_blocks_iter(struct erofs_vnode *vi,
+			    struct erofs_map_blocks *map);
+
 #define EFSCORRUPTED	EUCLEAN		/* Filesystem is corrupted */
 
 #endif
include/erofs_fs.h +4 -0
index 4cd79f01d820..a69f179a51a5 100644
@@ -279,6 +279,10 @@ struct z_erofs_vle_decompressed_index {
 	} di_u;
 };
 
+#define Z_EROFS_VLE_LEGACY_INDEX_ALIGN(size) \
+	(round_up(size, sizeof(struct z_erofs_vle_decompressed_index)) + \
+	 sizeof(struct z_erofs_map_header) + Z_EROFS_VLE_LEGACY_HEADER_PADDING)
+
 #define Z_EROFS_VLE_EXTENT_ALIGN(size) round_up(size, \
 	sizeof(struct z_erofs_vle_decompressed_index))
 
lib/Makefile.am +1 -1
index 22bd73255d04..487c4944479d 100644
@@ -3,7 +3,7 @@
 
 noinst_LTLIBRARIES = liberofs.la
 liberofs_la_SOURCES = config.c io.c cache.c super.c inode.c xattr.c exclude.c \
-		      data.c compress.c compressor.c
+		      data.c compress.c compressor.c decompress.c
 liberofs_la_CFLAGS = -Wall -Werror -I$(top_srcdir)/include
 if ENABLE_LZ4
 liberofs_la_CFLAGS += ${LZ4_CFLAGS}
lib/decompress.c new file +87 -0

87 lines not on this page · raw message

Signature · 1 line
2.24.0
#5 lore raw

PATCH v4 4/12 erofs-utils: fuse: clean up path walking

In reply to Gao Xiang via Linux-erofs
---
 fuse/namei.c  | 82 +++++++++++++++++++++------------------------------
 fuse/namei.h  |  2 --
 fuse/read.c   | 16 ++--------
 fuse/readir.c | 10 ++-----
 4 files changed, 39 insertions(+), 71 deletions(-)
fuse/namei.c +33 -49
index 5ee3f8d2a4b6..37cf549cd2a6 100644
@@ -17,27 +17,6 @@
 #include "erofs/print.h"
 #include "erofs/io.h"
 
-#define IS_PATH_SEPARATOR(__c)      ((__c) == '/')
-#define MINORBITS	20
-#define MINORMASK	((1U << MINORBITS) - 1)
-#define DT_UNKNOWN	0
-
-static const char *skip_trailing_backslash(const char *path)
-{
-	while (IS_PATH_SEPARATOR(*path))
-		path++;
-	return path;
-}
-
-static uint8_t get_path_token_len(const char *path)
-{
-	uint8_t len = 0;
-
-	while (path[len] != '/' && path[len])
-		len++;
-	return len;
-}
-
 static inline dev_t new_decode_dev(u32 dev)
 {
 	unsigned major = (dev & 0xfff00) >> 8;
@@ -45,7 +24,7 @@ static inline dev_t new_decode_dev(u32 dev)
 	return makedev(major, minor);
 }
 
-int erofs_iget_by_nid(erofs_nid_t nid, struct erofs_vnode *vi)
+static int erofs_iget_by_nid(erofs_nid_t nid, struct erofs_vnode *vi)
 {
 	int ret, ifmt;
 	char buf[EROFS_BLKSIZ];
@@ -136,14 +115,20 @@ struct erofs_dirent *find_target_dirent(erofs_nid_t pnid,
 	return NULL;
 }
 
-int erofs_namei(erofs_nid_t *nid,
+struct nameidata {
+	erofs_nid_t	nid;
+	unsigned int	ftype;
+};
+
+int erofs_namei(struct nameidata *nd,
 		const char *name, unsigned int len)
 {
+	erofs_nid_t nid = nd->nid;
 	int ret;
 	char buf[EROFS_BLKSIZ];
 	struct erofs_vnode v;
 
-	ret = erofs_iget_by_nid(*nid, &v);
+	ret = erofs_iget_by_nid(nid, &v);
 	if (ret)
 		return ret;
 
@@ -154,7 +139,7 @@ int erofs_namei(erofs_nid_t *nid,
 			.u = {
 				.i_blkaddr = v.raw_blkaddr,
 			},
-			.nid = v.nid,
+			.nid = nid,
 			.i_size = v.i_size,
 			.datalayout = v.datalayout,
 			.inode_isize = v.inode_isize,
@@ -175,17 +160,17 @@ int erofs_namei(erofs_nid_t *nid,
 			if (nameoff < sizeof(struct erofs_dirent) ||
 			    nameoff >= PAGE_SIZE) {
 				erofs_err("invalid de[0].nameoff %u @ nid %llu",
-					  nameoff, *nid | 0ULL);
+					  nameoff, nid | 0ULL);
 				return -EFSCORRUPTED;
 			}
 
-			de = find_target_dirent(*nid, buf, name, len,
+			de = find_target_dirent(nid, buf, name, len,
 						nameoff, maxsize);
 			if (IS_ERR(de))
 				return PTR_ERR(de);
 
 			if (de) {
-				*nid = le64_to_cpu(de->nid);
+				nd->nid = le64_to_cpu(de->nid);
 				return 0;
 			}
 			offset += maxsize;
@@ -194,44 +179,43 @@ int erofs_namei(erofs_nid_t *nid,
 	return -ENOENT;
 }
 
-extern struct dcache_entry root_entry;
-int walk_path(const char *_path, erofs_nid_t *out_nid)
+static int link_path_walk(const char *name, struct nameidata *nd)
 {
-	int ret;
-	erofs_nid_t nid = sbi.root_nid;
-	const char *path = _path;
+	nd->nid = sbi.root_nid;
+
+	while (*name == '/')
+		name++;
 
-	for (;;) {
-		uint8_t path_len;
+	/* At this point we know we have a real path component. */
+	while (*name != '\0') {
+		const char *p = name;
+		int ret;
 
-		path = skip_trailing_backslash(path);
-		path_len = get_path_token_len(path);
-		if (path_len == 0)
-			break;
+		do {
+			++p;
+		} while (*p != '\0' && *p != '/');
 
-		ret = erofs_namei(&nid, path, path_len);
+		DBG_BUGON(p <= name);
+		ret = erofs_namei(nd, name, p - name);
 		if (ret)
 			return ret;
 
-		path += path_len;
+		name = p;
+		/* Skip until no more slashes. */
+		for (name = p; *name == '/'; ++name);
 	}
-
-	erofs_dbg("find path = %s nid=%llu", _path, nid | 0ULL);
-
-	*out_nid = nid;
 	return 0;
-
 }
 
 int erofs_iget_by_path(const char *path, struct erofs_vnode *v)
 {
 	int ret;
-	erofs_nid_t nid;
+	struct nameidata nd;
 
-	ret = walk_path(path, &nid);
+	ret = link_path_walk(path, &nd);
 	if (ret)
 		return ret;
 
-	return erofs_iget_by_nid(nid, v);
+	return erofs_iget_by_nid(nd.nid, v);
 }
 
fuse/namei.h +0 -2
index 2625ec58d434..bd5adfda2969 100644
@@ -11,7 +11,5 @@
 #include "erofs_fs.h"
 
 int erofs_iget_by_path(const char *path, struct erofs_vnode *v);
-int erofs_iget_by_nid(erofs_nid_t nid, struct erofs_vnode *v);
-int walk_path(const char *path, erofs_nid_t *out_nid);
 
 #endif
fuse/read.c +3 -13
index 10a26d84c37c..aa5221a60d4e 100644
@@ -116,21 +116,16 @@ int erofs_read(const char *path, char *buffer, size_t size, off_t offset,
 	       struct fuse_file_info *fi)
 {
 	int ret;
-	erofs_nid_t nid;
 	struct erofs_vnode v;
 
 	UNUSED(fi);
 	erofs_info("path:%s size=%zd offset=%llu", path, size, (long long)offset);
 
-	ret = walk_path(path, &nid);
+	ret = erofs_iget_by_path(path, &v);
 	if (ret)
 		return ret;
 
-	ret = erofs_iget_by_nid(nid, &v);
-	if (ret)
-		return ret;
-
-	erofs_info("path:%s nid=%llu mode=%u", path, (unsigned long long)nid, v.datalayout);
+	erofs_info("path:%s nid=%llu mode=%u", path, v.nid | 0ULL, v.datalayout);
 	switch (v.datalayout) {
 	case EROFS_INODE_FLAT_PLAIN:
 	case EROFS_INODE_FLAT_INLINE:
@@ -148,15 +143,10 @@ int erofs_read(const char *path, char *buffer, size_t size, off_t offset,
 int erofs_readlink(const char *path, char *buffer, size_t size)
 {
 	int ret;
-	erofs_nid_t nid;
 	size_t lnksz;
 	struct erofs_vnode v;
 
-	ret = walk_path(path, &nid);
-	if (ret)
-		return ret;
-
-	ret = erofs_iget_by_nid(nid, &v);
+	ret = erofs_iget_by_path(path, &v);
 	if (ret)
 		return ret;
 
fuse/readir.c +3 -7
index 5281c8b80e59..1d28016a8900 100644
@@ -66,7 +66,6 @@ int erofs_readdir(const char *path, void *buf, fuse_fill_dir_t filler,
 		  off_t offset, struct fuse_file_info *fi)
 {
 	int ret;
-	erofs_nid_t nid;
 	struct erofs_vnode v;
 	char dirsbuf[EROFS_BLKSIZ];
 	uint32_t dir_nr, dir_off, nr_cnt;
@@ -74,14 +73,11 @@ int erofs_readdir(const char *path, void *buf, fuse_fill_dir_t filler,
 	erofs_dbg("readdir:%s offset=%llu", path, (long long)offset);
 	UNUSED(fi);
 
-	ret = walk_path(path, &nid);
+	ret = erofs_iget_by_path(path, &v);
 	if (ret)
 		return ret;
 
-	erofs_dbg("path=%s nid = %llu", path, (unsigned long long)nid);
-	ret = erofs_iget_by_nid(nid, &v);
-	if (ret)
-		return ret;
+	erofs_dbg("path=%s nid = %llu", path, v.nid | 0ULL);
 
 	if (!S_ISDIR(v.i_mode))
 		return -ENOTDIR;
@@ -107,7 +103,7 @@ int erofs_readdir(const char *path, void *buf, fuse_fill_dir_t filler,
 	if (v.datalayout == EROFS_INODE_FLAT_INLINE) {
 		off_t addr;
 
-		addr = iloc(nid) + v.inode_isize + v.xattr_isize;
+		addr = iloc(v.nid) + v.inode_isize + v.xattr_isize;
 
 		memset(dirsbuf, 0, sizeof(dirsbuf));
 		ret = dev_read(dirsbuf, addr, dir_off);
Signature · 1 line
2.24.0
#6 lore raw

PATCH v4 5/12 erofs: clean up compress data read

In reply to Gao Xiang via Linux-erofs
---
 fuse/Makefile.am         |  2 +-
 fuse/namei.c             | 17 ++++++--
 fuse/read.c              | 87 +++++++++++-----------------------------
 include/erofs/internal.h | 22 ++++++++--
 lib/Makefile.am          |  2 +-
 lib/data.c               | 73 +++++++++++++++++++++++++++++++++
 {fuse => lib}/zmap.c     | 36 ++++++++---------
 7 files changed, 147 insertions(+), 92 deletions(-)
 rename {fuse => lib}/zmap.c (94%)
fuse/Makefile.am +1 -1
index 84e5f834d6a4..d6e6d60cbfdc 100644
@@ -3,7 +3,7 @@
 
 AUTOMAKE_OPTIONS = foreign
 bin_PROGRAMS     = erofsfuse
-erofsfuse_SOURCES = main.c namei.c read.c readir.c zmap.c
+erofsfuse_SOURCES = main.c namei.c read.c readir.c
 erofsfuse_CFLAGS = -Wall -Werror \
                    -I$(top_srcdir)/include \
                    $(shell pkg-config fuse --cflags) \
fuse/namei.c +14 -3
index 37cf549cd2a6..fd5ae7bfc410 100644
@@ -71,9 +71,20 @@ static int erofs_iget_by_nid(erofs_nid_t nid, struct erofs_vnode *vi)
 	}
 
 	vi->z_inited = false;
-	if (erofs_inode_is_data_compressed(vi->datalayout))
-		z_erofs_fill_inode(vi);
-
+	if (erofs_inode_is_data_compressed(vi->datalayout)) {
+		struct erofs_inode ei = { .datalayout = vi->datalayout };
+
+		z_erofs_fill_inode(&ei);
+
+		/* XXX: will be dropped after erofs_vnode is removed */
+		vi->z_advise = ei.z_advise;
+		vi->z_algorithmtype[0] = ei.z_algorithmtype[0];
+		vi->z_algorithmtype[1] = ei.z_algorithmtype[1];
+		vi->z_logical_clusterbits = ei.z_logical_clusterbits;
+		vi->z_physical_clusterbits[0] = ei.z_physical_clusterbits[0];
+		vi->z_physical_clusterbits[1] = ei.z_physical_clusterbits[1];
+		vi->z_inited = (ei.flags != 0);
+	}
 	return 0;
 }
 
fuse/read.c +23 -64

95 lines not on this page · raw message

include/erofs/internal.h +18 -4
index fc28d82490a1..98e1263fa19c 100644
@@ -108,9 +108,13 @@ static inline void erofs_sb_clear_##name(void) \
 EROFS_FEATURE_FUNCS(lz4_0padding, incompat, INCOMPAT_LZ4_0PADDING)
 EROFS_FEATURE_FUNCS(sb_chksum, compat, COMPAT_SB_CHKSUM)
 
+#define EROFS_I_EA_INITED	(1 << 0)
+#define EROFS_I_Z_INITED	(1 << 1)
+
 struct erofs_inode {
 	struct list_head i_hash, i_subdirs, i_xattrs;
 
+	unsigned int flags;
 	unsigned int i_count;
 	struct erofs_inode *i_parent;
 
@@ -145,7 +149,16 @@ struct erofs_inode {
 	struct erofs_buffer_head *bh_inline, *bh_data;
 
 	void *idata;
-	void *compressmeta;
+
+	union {
+		void *compressmeta;
+		struct {
+			uint16_t z_advise;
+			uint8_t  z_algorithmtype[2];
+			uint8_t  z_logical_clusterbits;
+			uint8_t  z_physical_clusterbits[2];
+		};
+	};
 #ifdef WITH_ANDROID
 	uint64_t capabilities;
 #endif
@@ -265,10 +278,11 @@ int erofs_read_superblock(void);
 /* data.c */
 int erofs_read_raw_data(struct erofs_inode *inode, char *buffer,
 			erofs_off_t offset, erofs_off_t size);
-
+int z_erofs_read_data(struct erofs_inode *inode, char *buffer,
+		      erofs_off_t size, erofs_off_t offset);
 /* zmap.c */
-int z_erofs_fill_inode(struct erofs_vnode *vi);
-int z_erofs_map_blocks_iter(struct erofs_vnode *vi,
+int z_erofs_fill_inode(struct erofs_inode *vi);
+int z_erofs_map_blocks_iter(struct erofs_inode *vi,
 			    struct erofs_map_blocks *map);
 
 #define EFSCORRUPTED	EUCLEAN		/* Filesystem is corrupted */
lib/Makefile.am +1 -1
index 487c4944479d..7d9446b3cbcf 100644
@@ -3,7 +3,7 @@
 
 noinst_LTLIBRARIES = liberofs.la
 liberofs_la_SOURCES = config.c io.c cache.c super.c inode.c xattr.c exclude.c \
-		      data.c compress.c compressor.c decompress.c
+		      data.c compress.c compressor.c zmap.c decompress.c
 liberofs_la_CFLAGS = -Wall -Werror -I$(top_srcdir)/include
 if ENABLE_LZ4
 liberofs_la_CFLAGS += ${LZ4_CFLAGS}
lib/data.c +73 -0

87 lines not on this page · raw message

lib/zmap.c renamed from fuse/zmap.c +17 -19
similarity index 94%
rename from fuse/zmap.c
rename to lib/zmap.c
index ba5c457278a8..ee63de74cab2 100644
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0+
 /*
- * erofs-utils/fuse/zmap.c
+ * erofs-utils/lib/zmap.c
  *
  * (a large amount of code was adapted from Linux kernel. )
  *
@@ -12,7 +12,7 @@
 #include "erofs/io.h"
 #include "erofs/print.h"
 
-int z_erofs_fill_inode(struct erofs_vnode *vi)
+int z_erofs_fill_inode(struct erofs_inode *vi)
 {
 	if (vi->datalayout == EROFS_INODE_FLAT_COMPRESSION_LEGACY) {
 		vi->z_advise = 0;
@@ -21,27 +21,26 @@ int z_erofs_fill_inode(struct erofs_vnode *vi)
 		vi->z_logical_clusterbits = LOG_BLOCK_SIZE;
 		vi->z_physical_clusterbits[0] = vi->z_logical_clusterbits;
 		vi->z_physical_clusterbits[1] = vi->z_logical_clusterbits;
-		vi->z_inited = true;
-	}
 
+		vi->flags |= EROFS_I_Z_INITED;
+	}
 	return 0;
 }
 
-static int z_erofs_fill_inode_lazy(struct erofs_vnode *vi)
+static int z_erofs_fill_inode_lazy(struct erofs_inode *vi)
 {
 	int ret;
 	erofs_off_t pos;
 	struct z_erofs_map_header *h;
-	char buf[8];
+	char buf[sizeof(struct z_erofs_map_header)];
 
-	if (vi->z_inited)
+	if (vi->flags & EROFS_I_Z_INITED)
 		return 0;
 
 	DBG_BUGON(vi->datalayout == EROFS_INODE_FLAT_COMPRESSION_LEGACY);
-
 	pos = round_up(iloc(vi->nid) + vi->inode_isize + vi->xattr_isize, 8);
 
-	ret = dev_read(buf, pos, 8);
+	ret = dev_read(buf, pos, sizeof(buf));
 	if (ret < 0)
 		return -EIO;
 
@@ -68,13 +67,12 @@ static int z_erofs_fill_inode_lazy(struct erofs_vnode *vi)
 
 	vi->z_physical_clusterbits[1] = vi->z_logical_clusterbits +
 					((h->h_clusterbits >> 5) & 7);
-	vi->z_inited = true;
-
+	vi->flags |= EROFS_I_Z_INITED;
 	return 0;
 }
 
 struct z_erofs_maprecorder {
-	struct erofs_vnode *vnode;
+	struct erofs_inode *inode;
 	struct erofs_map_blocks *map;
 	void *kaddr;
 
@@ -108,7 +106,7 @@ static int z_erofs_reload_indexes(struct z_erofs_maprecorder *m,
 static int legacy_load_cluster_from_disk(struct z_erofs_maprecorder *m,
 					 unsigned long lcn)
 {
-	struct erofs_vnode *const vi = m->vnode;
+	struct erofs_inode *const vi = m->inode;
 	const erofs_off_t ibase = iloc(vi->nid);
 	const erofs_off_t pos =
 		Z_EROFS_VLE_LEGACY_INDEX_ALIGN(ibase + vi->inode_isize +
@@ -162,7 +160,7 @@ static int unpack_compacted_index(struct z_erofs_maprecorder *m,
 				  unsigned int amortizedshift,
 				  unsigned int eofs)
 {
-	struct erofs_vnode *const vi = m->vnode;
+	struct erofs_inode *const vi = m->inode;
 	const unsigned int lclusterbits = vi->z_logical_clusterbits;
 	const unsigned int lomask = (1 << lclusterbits) - 1;
 	unsigned int vcnt, base, lo, encodebits, nblk;
@@ -225,7 +223,7 @@ static int unpack_compacted_index(struct z_erofs_maprecorder *m,
 static int compacted_load_cluster_from_disk(struct z_erofs_maprecorder *m,
 					    unsigned long lcn)
 {
-	struct erofs_vnode *const vi = m->vnode;
+	struct erofs_inode *const vi = m->inode;
 	const unsigned int lclusterbits = vi->z_logical_clusterbits;
 	const erofs_off_t ebase = round_up(iloc(vi->nid) + vi->inode_isize +
 					   vi->xattr_isize, 8) +
@@ -279,7 +277,7 @@ out:
 static int z_erofs_load_cluster_from_disk(struct z_erofs_maprecorder *m,
 					  unsigned int lcn)
 {
-	const unsigned int datamode = m->vnode->datalayout;
+	const unsigned int datamode = m->inode->datalayout;
 
 	if (datamode == EROFS_INODE_FLAT_COMPRESSION_LEGACY)
 		return legacy_load_cluster_from_disk(m, lcn);
@@ -293,7 +291,7 @@ static int z_erofs_load_cluster_from_disk(struct z_erofs_maprecorder *m,
 static int z_erofs_extent_lookback(struct z_erofs_maprecorder *m,
 				   unsigned int lookback_distance)
 {
-	struct erofs_vnode *const vi = m->vnode;
+	struct erofs_inode *const vi = m->inode;
 	struct erofs_map_blocks *const map = m->map;
 	const unsigned int lclusterbits = vi->z_logical_clusterbits;
 	unsigned long lcn = m->lcn;
@@ -335,11 +333,11 @@ static int z_erofs_extent_lookback(struct z_erofs_maprecorder *m,
 	return 0;
 }
 
-int z_erofs_map_blocks_iter(struct erofs_vnode *vi,
+int z_erofs_map_blocks_iter(struct erofs_inode *vi,
 			    struct erofs_map_blocks *map)
 {
 	struct z_erofs_maprecorder m = {
-		.vnode = vi,
+		.inode = vi,
 		.map = map,
 		.kaddr = map->mpage,
 	};
Signature · 1 line
2.24.0
#7 lore raw

PATCH v4 6/12 erofs-utils: fuse: get rid of erofs_vnode

In reply to Gao Xiang via Linux-erofs
---
 fuse/main.c              |   7 ++-
 fuse/namei.c             | 110 +++++++++++++++------------------------
 fuse/namei.h             |   3 +-
 fuse/read.c              |  86 +++++-------------------------
 fuse/readir.c            |   9 ++--
 include/erofs/internal.h |  34 ------------
 6 files changed, 63 insertions(+), 186 deletions(-)
fuse/main.c +3 -4
index 563b2c378952..6176e836c2f1 100644
@@ -131,12 +131,11 @@ int erofs_open(const char *path, struct fuse_file_info *fi)
 
 int erofs_getattr(const char *path, struct stat *stbuf)
 {
-	struct erofs_vnode v;
+	struct erofs_inode v = { 0 };
 	int ret;
 
 	erofs_dbg("getattr(%s)", path);
-	memset(&v, 0, sizeof(v));
-	ret = erofs_iget_by_path(path, &v);
+	ret = erofs_ilookup(path, &v);
 	if (ret)
 		return -ENOENT;
 
@@ -146,7 +145,7 @@ int erofs_getattr(const char *path, struct stat *stbuf)
 	stbuf->st_blocks = stbuf->st_size / EROFS_BLKSIZ;
 	stbuf->st_uid = v.i_uid;
 	stbuf->st_gid = v.i_gid;
-	stbuf->st_rdev = v.i_rdev;
+	stbuf->st_rdev = v.u.i_rdev;
 	stbuf->st_atime = sbi.build_time;
 	stbuf->st_mtime = sbi.build_time;
 	stbuf->st_ctime = sbi.build_time;
fuse/namei.c +42 -68

170 lines not on this page · raw message

fuse/namei.h +1 -2
index bd5adfda2969..730caf0085f7 100644
@@ -8,8 +8,7 @@
 #define __INODE_H
 
 #include "erofs/internal.h"
-#include "erofs_fs.h"
 
-int erofs_iget_by_path(const char *path, struct erofs_vnode *v);
+int erofs_ilookup(const char *path, struct erofs_inode *vi);
 
 #endif
fuse/read.c +12 -74

117 lines not on this page · raw message

fuse/readir.c +5 -4
index 1d28016a8900..510aa7ebaf11 100644
@@ -66,14 +66,14 @@ int erofs_readdir(const char *path, void *buf, fuse_fill_dir_t filler,
 		  off_t offset, struct fuse_file_info *fi)
 {
 	int ret;
-	struct erofs_vnode v;
+	struct erofs_inode v;
 	char dirsbuf[EROFS_BLKSIZ];
 	uint32_t dir_nr, dir_off, nr_cnt;
 
 	erofs_dbg("readdir:%s offset=%llu", path, (long long)offset);
 	UNUSED(fi);
 
-	ret = erofs_iget_by_path(path, &v);
+	ret = erofs_ilookup(path, &v);
 	if (ret)
 		return ret;
 
@@ -89,11 +89,12 @@ int erofs_readdir(const char *path, void *buf, fuse_fill_dir_t filler,
 	dir_off = erofs_blkoff(v.i_size);
 	nr_cnt = 0;
 
-	erofs_dbg("dir_size=%u dir_nr = %u dir_off=%u", v.i_size, dir_nr, dir_off);
+	erofs_dbg("dir_size=%llu dir_nr = %u dir_off=%u",
+		  v.i_size | 0ULL, dir_nr, dir_off);
 
 	while (nr_cnt < dir_nr) {
 		memset(dirsbuf, 0, sizeof(dirsbuf));
-		ret = blk_read(dirsbuf, v.raw_blkaddr + nr_cnt, 1);
+		ret = blk_read(dirsbuf, v.u.i_blkaddr + nr_cnt, 1);
 		if (ret < 0)
 			return -EIO;
 		fill_dir(dirsbuf, filler, buf, EROFS_BLKSIZ);
include/erofs/internal.h +0 -34
index 98e1263fa19c..573ebfc298b5 100644
@@ -164,40 +164,6 @@ struct erofs_inode {
 #endif
 };
 
-struct erofs_vnode {
-	uint8_t datalayout;
-
-	uint32_t i_size;
-	/* inline size in bytes */
-	uint16_t inode_isize;
-	uint16_t xattr_isize;
-
-	uint16_t xattr_shared_count;
-	char *xattr_shared_xattrs;
-
-	union {
-		erofs_blk_t raw_blkaddr;
-		struct {
-			uint16_t z_advise;
-			uint8_t  z_algorithmtype[2];
-			uint8_t  z_logical_clusterbits;
-			uint8_t  z_physical_clusterbits[2];
-		};
-	};
-	erofs_nid_t nid;
-	uint32_t i_ino;
-
-	uint16_t i_mode;
-	uint16_t i_uid;
-	uint16_t i_gid;
-	uint16_t i_nlink;
-	uint32_t i_rdev;
-
-	bool z_inited;
-	/* if file is inline read inline data witch inode */
-	char *idata;
-};
-
 static inline bool is_inode_layout_compression(struct erofs_inode *inode)
 {
 	return erofs_inode_is_data_compressed(inode->datalayout);
Signature · 1 line
2.24.0
#8 lore raw

PATCH v4 7/12 erofs-utils: fuse: move namei.c to lib/

In reply to Gao Xiang via Linux-erofs
---
 fuse/Makefile.am         |  2 +-
 fuse/main.c              |  1 -
 fuse/namei.h             | 14 --------------
 fuse/read.c              |  1 -
 fuse/readir.c            |  1 -
 include/erofs/internal.h |  3 +++
 lib/Makefile.am          |  2 +-
 {fuse => lib}/namei.c    |  3 +--
 8 files changed, 6 insertions(+), 21 deletions(-)
 delete mode 100644 fuse/namei.h
 rename {fuse => lib}/namei.c (98%)
fuse/Makefile.am +1 -1
index d6e6d60cbfdc..f37069ff7f12 100644
@@ -3,7 +3,7 @@
 
 AUTOMAKE_OPTIONS = foreign
 bin_PROGRAMS     = erofsfuse
-erofsfuse_SOURCES = main.c namei.c read.c readir.c
+erofsfuse_SOURCES = main.c read.c readir.c
 erofsfuse_CFLAGS = -Wall -Werror \
                    -I$(top_srcdir)/include \
                    $(shell pkg-config fuse --cflags) \
fuse/main.c +0 -1
index 6176e836c2f1..fee90154a251 100644
@@ -12,7 +12,6 @@
 #include <stddef.h>
 
 #include "erofs/print.h"
-#include "namei.h"
 #include "read.h"
 #include "readir.h"
 #include "erofs/io.h"
fuse/namei.h deleted +0 -14
deleted file mode 100644
index 730caf0085f7..000000000000
@@ -1,14 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * erofs-utils/fuse/inode.h
- *
- * Created by Li Guifu <[email protected]>
- */
-#ifndef __INODE_H
-#define __INODE_H
-
-#include "erofs/internal.h"
-
-int erofs_ilookup(const char *path, struct erofs_inode *vi);
-
-#endif
fuse/read.c +0 -1
index 4e0058c01e81..2ef979ddba63 100644
@@ -14,7 +14,6 @@
 #include "erofs/defs.h"
 #include "erofs/internal.h"
 #include "erofs/print.h"
-#include "namei.h"
 #include "erofs/io.h"
 #include "erofs/decompress.h"
 
fuse/readir.c +0 -1
index 510aa7ebaf11..a405dd702d84 100644
@@ -12,7 +12,6 @@
 #include "erofs/defs.h"
 #include "erofs/internal.h"
 #include "erofs_fs.h"
-#include "namei.h"
 #include "erofs/io.h"
 #include "erofs/print.h"
 
include/erofs/internal.h +3 -0
index 573ebfc298b5..7357ed75e3f8 100644
@@ -241,6 +241,9 @@ struct erofs_map_blocks {
 /* super.c */
 int erofs_read_superblock(void);
 
+/* namei.c */
+int erofs_ilookup(const char *path, struct erofs_inode *vi);
+
 /* data.c */
 int erofs_read_raw_data(struct erofs_inode *inode, char *buffer,
 			erofs_off_t offset, erofs_off_t size);
lib/Makefile.am +1 -1
index 7d9446b3cbcf..f21dc35eda51 100644
@@ -3,7 +3,7 @@
 
 noinst_LTLIBRARIES = liberofs.la
 liberofs_la_SOURCES = config.c io.c cache.c super.c inode.c xattr.c exclude.c \
-		      data.c compress.c compressor.c zmap.c decompress.c
+		      namei.c data.c compress.c compressor.c zmap.c decompress.c
 liberofs_la_CFLAGS = -Wall -Werror -I$(top_srcdir)/include
 if ENABLE_LZ4
 liberofs_la_CFLAGS += ${LZ4_CFLAGS}
lib/namei.c renamed from fuse/namei.c +1 -2
similarity index 98%
rename from fuse/namei.c
rename to lib/namei.c
index 326ea85809bb..2e024d88d93e 100644
@@ -1,10 +1,9 @@
 // SPDX-License-Identifier: GPL-2.0+
 /*
- * erofs-utils/fuse/namei.c
+ * erofs-utils/lib/namei.c
  *
  * Created by Li Guifu <[email protected]>
  */
-#include "namei.h"
 #include <linux/kdev_t.h>
 #include <sys/types.h>
 #include <unistd.h>
Signature · 1 line
2.24.0
#9 lore raw

PATCH v4 8/12 erofs-utils: fuse: kill read.c

In reply to Gao Xiang via Linux-erofs
---
 fuse/Makefile.am         |  2 +-
 fuse/main.c              | 34 +++++++++++++++++++++--
 fuse/read.c              | 59 ----------------------------------------
 fuse/read.h              | 17 ------------
 include/erofs/internal.h |  6 ++--
 lib/data.c               | 24 +++++++++++++---
 lib/namei.c              |  2 +-
 7 files changed, 55 insertions(+), 89 deletions(-)
 delete mode 100644 fuse/read.c
 delete mode 100644 fuse/read.h
fuse/Makefile.am +1 -1
index f37069ff7f12..21a1ee975141 100644
@@ -3,7 +3,7 @@
 
 AUTOMAKE_OPTIONS = foreign
 bin_PROGRAMS     = erofsfuse
-erofsfuse_SOURCES = main.c read.c readir.c
+erofsfuse_SOURCES = main.c readir.c
 erofsfuse_CFLAGS = -Wall -Werror \
                    -I$(top_srcdir)/include \
                    $(shell pkg-config fuse --cflags) \
fuse/main.c +31 -3
index fee90154a251..9ac8149c88d9 100644
@@ -12,7 +12,6 @@
 #include <stddef.h>
 
 #include "erofs/print.h"
-#include "read.h"
 #include "readir.h"
 #include "erofs/io.h"
 
@@ -151,12 +150,41 @@ int erofs_getattr(const char *path, struct stat *stbuf)
 	return 0;
 }
 
+static int erofsfuse_read(const char *path, char *buffer,
+			  size_t size, off_t offset,
+			  struct fuse_file_info *fi)
+{
+	int ret;
+	struct erofs_inode vi;
+
+	UNUSED(fi);
+	erofs_info("path:%s size=%zd offset=%llu", path, size, (long long)offset);
+
+	ret = erofs_ilookup(path, &vi);
+	if (ret)
+		return ret;
+
+	ret = erofs_pread(&vi, buffer, size, offset);
+	if (ret)
+		return ret;
+	return size;
+}
+
+static int erofsfuse_readlink(const char *path, char *buffer, size_t size)
+{
+	int ret = erofsfuse_read(path, buffer, size, 0, NULL);
+
+	if (ret < 0)
+		return ret;
+	return 0;
+}
+
 static struct fuse_operations erofs_ops = {
-	.readlink = erofs_readlink,
+	.readlink = erofsfuse_readlink,
 	.getattr = erofs_getattr,
 	.readdir = erofs_readdir,
 	.open = erofs_open,
-	.read = erofs_read,
+	.read = erofsfuse_read,
 	.init = erofs_init,
 };
 
fuse/read.c deleted +0 -59

59 lines not on this page · raw message

fuse/read.h deleted +0 -17
deleted file mode 100644
index e901c607dc91..000000000000
@@ -1,17 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * erofs-utils/fuse/read.h
- *
- * Created by Li Guifu <[email protected]>
- */
-#ifndef __EROFS_READ_H
-#define __EROFS_READ_H
-
-#include <fuse.h>
-#include <fuse_opt.h>
-
-int erofs_read(const char *path, char *buffer, size_t size, off_t offset,
-	    struct fuse_file_info *fi);
-int erofs_readlink(const char *path, char *buffer, size_t size);
-
-#endif
include/erofs/internal.h +2 -4
index 7357ed75e3f8..13420a8e7733 100644
@@ -245,10 +245,8 @@ int erofs_read_superblock(void);
 int erofs_ilookup(const char *path, struct erofs_inode *vi);
 
 /* data.c */
-int erofs_read_raw_data(struct erofs_inode *inode, char *buffer,
-			erofs_off_t offset, erofs_off_t size);
-int z_erofs_read_data(struct erofs_inode *inode, char *buffer,
-		      erofs_off_t size, erofs_off_t offset);
+int erofs_pread(struct erofs_inode *inode, char *buf,
+		erofs_off_t count, erofs_off_t offset);
 /* zmap.c */
 int z_erofs_fill_inode(struct erofs_inode *vi);
 int z_erofs_map_blocks_iter(struct erofs_inode *vi,
lib/data.c +20 -4
index 62fd057185ee..34811e49512f 100644
@@ -70,8 +70,8 @@ err_out:
 	return err;
 }
 
-int erofs_read_raw_data(struct erofs_inode *inode, char *buffer,
-			erofs_off_t offset, erofs_off_t size)
+static int erofs_read_raw_data(struct erofs_inode *inode, char *buffer,
+			       erofs_off_t size, erofs_off_t offset)
 {
 	struct erofs_map_blocks map = {
 		.index = UINT_MAX,
@@ -117,8 +117,8 @@ int erofs_read_raw_data(struct erofs_inode *inode, char *buffer,
 	return 0;
 }
 
-int z_erofs_read_data(struct erofs_inode *inode, char *buffer,
-		      erofs_off_t offset, erofs_off_t size)
+static int z_erofs_read_data(struct erofs_inode *inode, char *buffer,
+			     erofs_off_t size, erofs_off_t offset)
 {
 	int ret;
 	erofs_off_t end, length, skip;
@@ -188,3 +188,19 @@ int z_erofs_read_data(struct erofs_inode *inode, char *buffer,
 	return 0;
 }
 
+int erofs_pread(struct erofs_inode *inode, char *buf,
+		erofs_off_t count, erofs_off_t offset)
+{
+	switch (inode->datalayout) {
+	case EROFS_INODE_FLAT_PLAIN:
+	case EROFS_INODE_FLAT_INLINE:
+		return erofs_read_raw_data(inode, buf, count, offset);
+	case EROFS_INODE_FLAT_COMPRESSION_LEGACY:
+	case EROFS_INODE_FLAT_COMPRESSION:
+		return z_erofs_read_data(inode, buf, count, offset);
+	default:
+		break;
+	}
+	return -EINVAL;
+}
+
lib/namei.c +1 -1
index 2e024d88d93e..4e6aceb90df1 100644
@@ -136,7 +136,7 @@ int erofs_namei(struct nameidata *nd,
 		struct erofs_dirent *de = (void *)buf;
 		unsigned int nameoff;
 
-		ret = erofs_read_raw_data(&vi, buf, offset, maxsize);
+		ret = erofs_pread(&vi, buf, maxsize, offset);
 		if (ret)
 			return ret;
 
Signature · 1 line
2.24.0
#10 lore raw

PATCH v4 9/12 erofs-utils: fuse: clean up readdir

In reply to Gao Xiang via Linux-erofs
---
 fuse/main.c   |   2 +-
 fuse/readir.c | 155 +++++++++++++++++++++++---------------------------
 fuse/readir.h |   4 +-
 3 files changed, 74 insertions(+), 87 deletions(-)
fuse/main.c +1 -1
index 9ac8149c88d9..a4b7a3692c19 100644
@@ -182,7 +182,7 @@ static int erofsfuse_readlink(const char *path, char *buffer, size_t size)
 static struct fuse_operations erofs_ops = {
 	.readlink = erofsfuse_readlink,
 	.getattr = erofs_getattr,
-	.readdir = erofs_readdir,
+	.readdir = erofsfuse_readdir,
 	.open = erofs_open,
 	.read = erofsfuse_read,
 	.init = erofs_init,
fuse/readir.c +71 -84

185 lines not on this page · raw message

fuse/readir.h +2 -2
index ee2ab8bdd0f0..16b878fe9f29 100644
@@ -10,8 +10,8 @@
 #include <fuse.h>
 #include <fuse_opt.h>
 
-int erofs_readdir(const char *path, void *buffer, fuse_fill_dir_t filler,
-	       off_t offset, struct fuse_file_info *fi);
+int erofsfuse_readdir(const char *path, void *buffer, fuse_fill_dir_t filler,
+		      off_t offset, struct fuse_file_info *fi);
 
 
 #endif
Signature · 1 line
2.24.0
#11 lore raw

PATCH v4 10/12 erofs-utils: fuse: rename readir.c to dir.c

In reply to Gao Xiang via Linux-erofs
---
 fuse/Makefile.am         |  2 +-
 fuse/{readir.c => dir.c} |  2 +-
 fuse/main.c              |  7 ++++++-
 fuse/readir.h            | 17 -----------------
 4 files changed, 8 insertions(+), 20 deletions(-)
 rename fuse/{readir.c => dir.c} (98%)
 delete mode 100644 fuse/readir.h
fuse/Makefile.am +1 -1
index 21a1ee975141..4ed4215b9936 100644
@@ -3,7 +3,7 @@
 
 AUTOMAKE_OPTIONS = foreign
 bin_PROGRAMS     = erofsfuse
-erofsfuse_SOURCES = main.c readir.c
+erofsfuse_SOURCES = dir.c main.c
 erofsfuse_CFLAGS = -Wall -Werror \
                    -I$(top_srcdir)/include \
                    $(shell pkg-config fuse --cflags) \
fuse/dir.c renamed from fuse/readir.c +1 -1
similarity index 98%
rename from fuse/readir.c
rename to fuse/dir.c
index 2e90c95c38aa..f6c1295f52bd 100644
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0+
 /*
- * erofs-utils/fuse/readir.c
+ * erofs-utils/fuse/dir.c
  *
  * Created by Li Guifu <[email protected]>
  */
fuse/main.c +6 -1
index a4b7a3692c19..236d54635acb 100644
@@ -11,10 +11,15 @@
 #include <signal.h>
 #include <stddef.h>
 
+#include <fuse.h>
+#include <fuse_opt.h>
+
 #include "erofs/print.h"
-#include "readir.h"
 #include "erofs/io.h"
 
+int erofsfuse_readdir(const char *path, void *buffer, fuse_fill_dir_t filler,
+		      off_t offset, struct fuse_file_info *fi);
+
 /* XXX: after liberofs is linked in, it should be removed */
 struct erofs_configure cfg;
 
fuse/readir.h deleted +0 -17
deleted file mode 100644
index 16b878fe9f29..000000000000
@@ -1,17 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * erofs-utils/fuse/readir.h
- *
- * Created by Li Guifu <[email protected]>
- */
-#ifndef __EROFS_READDIR_H
-#define __EROFS_READDIR_H
-
-#include <fuse.h>
-#include <fuse_opt.h>
-
-int erofsfuse_readdir(const char *path, void *buffer, fuse_fill_dir_t filler,
-		      off_t offset, struct fuse_file_info *fi);
-
-
-#endif
Signature · 1 line
2.24.0
#12 lore raw

PATCH v4 11/12 erofs-utils: fuse: cleanup main.c

---
 fuse/main.c | 240 +++++++++++++++++++++++++---------------------------
 1 file changed, 113 insertions(+), 127 deletions(-)
fuse/main.c +113 -127
index 236d54635acb..7beaba8a9bc2 100644
@@ -4,125 +4,28 @@
  *
  * Created by Li Guifu <[email protected]>
  */
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <execinfo.h>
 #include <signal.h>
-#include <stddef.h>
-
+#include <libgen.h>
 #include <fuse.h>
 #include <fuse_opt.h>
 
+#include "erofs/config.h"
 #include "erofs/print.h"
 #include "erofs/io.h"
 
 int erofsfuse_readdir(const char *path, void *buffer, fuse_fill_dir_t filler,
 		      off_t offset, struct fuse_file_info *fi);
 
-/* XXX: after liberofs is linked in, it should be removed */
-struct erofs_configure cfg;
-
-enum {
-	EROFS_OPT_HELP,
-	EROFS_OPT_VER,
-};
-
-struct options {
-	const char *disk;
-	const char *mount;
-	const char *logfile;
-	unsigned int debug_lvl;
-};
-static struct options fusecfg;
-
-#define OPTION(t, p)    { t, offsetof(struct options, p), 1 }
-
-static const struct fuse_opt option_spec[] = {
-	OPTION("--log=%s", logfile),
-	OPTION("--dbg=%u", debug_lvl),
-	FUSE_OPT_KEY("-h", EROFS_OPT_HELP),
-	FUSE_OPT_KEY("-v", EROFS_OPT_VER),
-	FUSE_OPT_END
-};
-
-static void usage(void)
-{
-	fprintf(stderr, "\terofsfuse [options] <image> <mountpoint>\n");
-	fprintf(stderr, "\t    --log=<file>    output log file\n");
-	fprintf(stderr, "\t    --dbg=<level>   log debug level 0 ~ 7\n");
-	fprintf(stderr, "\t    -h   show help\n");
-	fprintf(stderr, "\t    -v   show version\n");
-	exit(1);
-}
-
-static void dump_cfg(void)
-{
-	fprintf(stderr, "\tdisk :%s\n", fusecfg.disk);
-	fprintf(stderr, "\tmount:%s\n", fusecfg.mount);
-	fprintf(stderr, "\tdebug_lvl:%u\n", fusecfg.debug_lvl);
-	fprintf(stderr, "\tlogfile  :%s\n", fusecfg.logfile);
-}
-
-static int optional_opt_func(void *data, const char *arg, int key,
-			     struct fuse_args *outargs)
-{
-	UNUSED(data);
-	UNUSED(outargs);
-
-	switch (key) {
-	case FUSE_OPT_KEY_OPT:
-		return 1;
-
-	case FUSE_OPT_KEY_NONOPT:
-		if (!fusecfg.disk) {
-			fusecfg.disk = strdup(arg);
-			return 0;
-		} else if (!fusecfg.mount)
-			fusecfg.mount = strdup(arg);
-
-		return 1;
-	case EROFS_OPT_HELP:
-		usage();
-		break;
-
-	case EROFS_OPT_VER:
-		fprintf(stderr, "EROFS FUSE VERSION v 1.0.0\n");
-		exit(0);
-	}
-
-	return 1;
-}
-
-static void signal_handle_sigsegv(int signal)
-{
-	void *array[10];
-	size_t nptrs;
-	char **strings;
-	size_t i;
-
-	UNUSED(signal);
-	erofs_dbg("========================================");
-	erofs_dbg("Segmentation Fault.  Starting backtrace:");
-	nptrs = backtrace(array, 10);
-	strings = backtrace_symbols(array, nptrs);
-	if (strings) {
-		for (i = 0; i < nptrs; i++)
-			erofs_dbg("%s", strings[i]);
-		free(strings);
-	}
-	erofs_dbg("========================================");
-
-	abort();
-}
-
-void *erofs_init(struct fuse_conn_info *info)
+static void *erofsfuse_init(struct fuse_conn_info *info)
 {
 	erofs_info("Using FUSE protocol %d.%d", info->proto_major, info->proto_minor);
 	return NULL;
 }
 
-int erofs_open(const char *path, struct fuse_file_info *fi)
+static int erofsfuse_open(const char *path, struct fuse_file_info *fi)
 {
 	erofs_info("open path=%s", path);
 
@@ -132,7 +35,7 @@ int erofs_open(const char *path, struct fuse_file_info *fi)
 	return 0;
 }
 
-int erofs_getattr(const char *path, struct stat *stbuf)
+static int erofsfuse_getattr(const char *path, struct stat *stbuf)
 {
 	struct erofs_inode v = { 0 };
 	int ret;
@@ -186,51 +89,134 @@ static int erofsfuse_readlink(const char *path, char *buffer, size_t size)
 
 static struct fuse_operations erofs_ops = {
 	.readlink = erofsfuse_readlink,
-	.getattr = erofs_getattr,
+	.getattr = erofsfuse_getattr,
 	.readdir = erofsfuse_readdir,
-	.open = erofs_open,
+	.open = erofsfuse_open,
 	.read = erofsfuse_read,
-	.init = erofs_init,
+	.init = erofsfuse_init,
 };
 
+static struct options {
+	const char *disk;
+	const char *mount;
+	unsigned int debug_lvl;
+	bool show_help;
+} fusecfg;
+
+#define OPTION(t, p)                           \
+    { t, offsetof(struct options, p), 1 }
+static const struct fuse_opt option_spec[] = {
+	OPTION("-d %u", debug_lvl),
+	OPTION("-h", show_help),
+	OPTION("--help", show_help),
+	FUSE_OPT_END
+};
+
+#define OPTION(t, p)    { t, offsetof(struct options, p), 1 }
+
+static void usage(void)
+{
+	fprintf(stderr, "\terofsfuse [options] <image> <mountpoint>\n");
+	fprintf(stderr, "\t    --log=<file>    output log file\n");
+	fprintf(stderr, "\t    --dbg=<level>   log debug level 0 ~ 7\n");
+	fprintf(stderr, "\t    -h   show help\n");
+	fprintf(stderr, "\t    -v   show version\n");
+	exit(EXIT_FAILURE);
+}
+
+static void erofsfuse_dumpcfg(void)
+{
+	erofs_info("disk: %s", fusecfg.disk);
+	erofs_info("mountpoint: %s", fusecfg.mount);
+	erofs_info("debug level: %u", cfg.c_dbg_lvl);
+}
+
+static int optional_opt_func(void *data, const char *arg, int key,
+			     struct fuse_args *outargs)
+{
+	switch (key) {
+	case FUSE_OPT_KEY_NONOPT:
+		if (!fusecfg.disk) {
+			fusecfg.disk = strdup(arg);
+			return 0;
+		}
+		if (!fusecfg.mount)
+			fusecfg.mount = strdup(arg);
+	case FUSE_OPT_KEY_OPT:
+		break;
+	default:
+		DBG_BUGON(1);
+		break;
+	}
+	return 1;
+}
+
+static void signal_handle_sigsegv(int signal)
+{
+	void *array[10];
+	size_t nptrs;
+	char **strings;
+	size_t i;
+
+	UNUSED(signal);
+	erofs_dbg("========================================");
+	erofs_dbg("Segmentation Fault.  Starting backtrace:");
+	nptrs = backtrace(array, 10);
+	strings = backtrace_symbols(array, nptrs);
+	if (strings) {
+		for (i = 0; i < nptrs; i++)
+			erofs_dbg("%s", strings[i]);
+		free(strings);
+	}
+	erofs_dbg("========================================");
+
+	abort();
+}
+
+
 int main(int argc, char *argv[])
 {
-	int ret = EXIT_FAILURE;
+	int ret;
 	struct fuse_args args = FUSE_ARGS_INIT(argc, argv);
 
+	erofs_init_configure();
+	fprintf(stderr, "%s %s\n", basename(argv[0]), cfg.c_version);
+
 	if (signal(SIGSEGV, signal_handle_sigsegv) == SIG_ERR) {
-		fprintf(stderr, "Failed to initialize signals\n");
-		return EXIT_FAILURE;
+		fprintf(stderr, "failed to initialize signals\n");
+		ret = -errno;
+		goto err;
 	}
 
-	/* Parse options */
-	if (fuse_opt_parse(&args, &fusecfg, option_spec, optional_opt_func) < 0)
-		return 1;
-
-	dump_cfg();
+	/* parse options */
+	ret = fuse_opt_parse(&args, &fusecfg, option_spec, optional_opt_func);
+	if (ret)
+		goto err;
 
+	if (fusecfg.show_help)
+		usage();
 	cfg.c_dbg_lvl = fusecfg.debug_lvl;
 
-	if (dev_open_ro(fusecfg.disk) < 0) {
-		fprintf(stderr, "Failed to open disk:%s\n", fusecfg.disk);
-		goto exit;
+	erofsfuse_dumpcfg();
+	ret = dev_open_ro(fusecfg.disk);
+	if (ret) {
+		fprintf(stderr, "failed to open: %s\n", fusecfg.disk);
+		goto err_fuse_free_args;
 	}
 
-	if (erofs_read_superblock()) {
-		fprintf(stderr, "Failed to read erofs super block\n");
-		goto exit_dev;
+	ret = erofs_read_superblock();
+	if (ret) {
+		fprintf(stderr, "failed to read erofs super block\n");
+		goto err_dev_close;
 	}
 
-	erofs_info("fuse start");
-
 	ret = fuse_main(args.argc, args.argv, &erofs_ops, NULL);
-
-	erofs_info("fuse done ret=%d", ret);
-
-exit_dev:
+err_dev_close:
 	dev_close();
-exit:
+err_fuse_free_args:
 	fuse_opt_free_args(&args);
-	return ret;
+err:
+	erofs_exit_configure();
+	return ret ? EXIT_FAILURE : EXIT_SUCCESS;
 }
 
Signature · 1 line
2.24.0
#13 lore raw

PATCH v4 12/12 erofs-utils: fuse: fix up configure.ac / Makefile.am

In reply to Gao Xiang via Linux-erofs
---
 Makefile.am      |  6 +++++-
 configure.ac     | 19 +++++++++++++++++++
 fuse/Makefile.am | 10 +++-------
 3 files changed, 27 insertions(+), 8 deletions(-)
Makefile.am +5 -1
index 24f4a7b3d5ad..b804aa90efa9 100644
@@ -3,4 +3,8 @@
 
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = man lib mkfs fuse
+SUBDIRS = man lib mkfs
+if ENABLE_FUSE
+SUBDIRS += fuse
+endif
+
configure.ac +19 -0
index e6d2e5fd3702..80d38d0ef952 100644
@@ -63,6 +63,10 @@ AC_ARG_ENABLE(lz4,
    [AS_HELP_STRING([--disable-lz4], [disable LZ4 compression support @<:@default=enabled@:>@])],
    [enable_lz4="$enableval"], [enable_lz4="yes"])
 
+AC_ARG_ENABLE(fuse,
+   [AS_HELP_STRING([--disable-fuse], [disable erofsfuse @<:@default=enabled@:>@])],
+   [enable_fuse="$enableval"], [enable_fuse="yes"])
+
 AC_ARG_WITH(uuid,
    [AS_HELP_STRING([--without-uuid],
       [Ignore presence of libuuid and disable uuid support @<:@default=enabled@:>@])])
@@ -183,6 +187,20 @@ AS_IF([test "x$with_selinux" != "xno"], [
   LIBS="${saved_LIBS}"
   CPPFLAGS="${saved_CPPFLAGS}"], [have_selinux="no"])
 
+# Configure fuse
+AS_IF([test "x$enable_fuse" != "xno"], [
+  PKG_CHECK_MODULES([libfuse], [fuse >= 2.6.0])
+  # Paranoia: don't trust the result reported by pkgconfig before trying out
+  saved_LIBS="$LIBS"
+  saved_CPPFLAGS=${CPPFLAGS}
+  CPPFLAGS="${libfuse_CFLAGS} ${CPPFLAGS}"
+  LIBS="${libfuse_LIBS} $LIBS"
+  AC_CHECK_LIB(fuse, fuse_main, [
+    have_fuse="yes" ], [
+    AC_MSG_ERROR([libfuse >= 2.6.0 doesn't work properly])])
+  LIBS="${saved_LIBS}"
+  CPPFLAGS="${saved_CPPFLAGS}"], [have_fuse="no"])
+
 # Configure lz4
 test -z $LZ4_LIBS && LZ4_LIBS='-llz4'
 
@@ -218,6 +236,7 @@ fi
 # Set up needed symbols, conditionals and compiler/linker flags
 AM_CONDITIONAL([ENABLE_LZ4], [test "x${have_lz4}" = "xyes"])
 AM_CONDITIONAL([ENABLE_LZ4HC], [test "x${have_lz4hc}" = "xyes"])
+AM_CONDITIONAL([ENABLE_FUSE], [test "x${have_fuse}" = "xyes"])
 
 if test "x$have_uuid" = "xyes"; then
   AC_DEFINE([HAVE_LIBUUID], 1, [Define to 1 if libuuid is found])
fuse/Makefile.am +3 -7
index 4ed4215b9936..6636ee1aec69 100644
@@ -4,11 +4,7 @@
 AUTOMAKE_OPTIONS = foreign
 bin_PROGRAMS     = erofsfuse
 erofsfuse_SOURCES = dir.c main.c
-erofsfuse_CFLAGS = -Wall -Werror \
-                   -I$(top_srcdir)/include \
-                   $(shell pkg-config fuse --cflags) \
-                   -DFUSE_USE_VERSION=26 \
-                   -std=gnu99
-LDFLAGS += $(shell pkg-config fuse --libs)
-erofsfuse_LDADD = $(top_builddir)/lib/liberofs.la -ldl ${LZ4_LIBS}
+erofsfuse_CFLAGS = -Wall -Werror -I$(top_srcdir)/include
+erofsfuse_CFLAGS += -DFUSE_USE_VERSION=26 ${libfuse_CFLAGS}
+erofsfuse_LDADD = $(top_builddir)/lib/liberofs.la ${libfuse_LIBS} ${LZ4_LIBS}
 
Signature · 1 line
2.24.0