Linux-EROFS Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Jingbo Xu <jefflexu@linux.alibaba.com>
To: xiang@kernel.org, linux-erofs@lists.ozlabs.org
Subject: [PATCH v2 12/16] erofs-utils: add erofs image helper
Date: Wed,  2 Aug 2023 17:17:46 +0800	[thread overview]
Message-ID: <20230802091750.74181-12-jefflexu@linux.alibaba.com> (raw)
In-Reply-To: <20230802091750.74181-1-jefflexu@linux.alibaba.com>

Later we are going to introduce new feature of merging multiple erofs
images generated from tarfs mode.  Add helpers registering and cleaning
these images.

Signed-off-by: Jingbo Xu <jefflexu@linux.alibaba.com>
---
 include/erofs/rebuild.h | 12 +++++++++++
 lib/rebuild.c           | 45 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 57 insertions(+)

diff --git a/include/erofs/rebuild.h b/include/erofs/rebuild.h
index 92873c9..df7613a 100644
--- a/include/erofs/rebuild.h
+++ b/include/erofs/rebuild.h
@@ -9,6 +9,18 @@ extern "C"
 
 #include "internal.h"
 
+struct erofs_img {
+	struct list_head list;
+	char *path;
+	dev_t dev;
+	struct erofs_sb_info sbi;
+};
+
+extern unsigned int imgs_count;
+struct erofs_img *erofs_get_img(const char *path);
+int erofs_add_img(const char *path);
+void erofs_cleanup_imgs(void);
+
 struct erofs_dentry *erofs_rebuild_get_dentry(struct erofs_inode *pwd,
 		char *path, bool aufs, bool *whout, bool *opq);
 
diff --git a/lib/rebuild.c b/lib/rebuild.c
index 7aaa071..e2f6c1d 100644
--- a/lib/rebuild.c
+++ b/lib/rebuild.c
@@ -16,6 +16,9 @@
 #define AUFS_WH_DIROPQ		AUFS_WH_PFX AUFS_DIROPQ_NAME
 #endif
 
+unsigned int imgs_count;
+static LIST_HEAD(imgs_list);
+
 static struct erofs_dentry *erofs_rebuild_mkdir(struct erofs_inode *dir,
 						const char *s)
 {
@@ -115,3 +118,45 @@ struct erofs_dentry *erofs_rebuild_get_dentry(struct erofs_inode *pwd,
 	}
 	return d;
 }
+
+struct erofs_img *erofs_get_img(const char *path)
+{
+	struct erofs_img *img = malloc(sizeof(*img));
+
+	if (!img)
+		return ERR_PTR(-ENOMEM);
+
+	img->path = realpath(path, NULL);
+	if (!img->path) {
+		erofs_err("failed to parse image file (%s): %s",
+			  path, erofs_strerror(-errno));
+		free(img);
+		return ERR_PTR(-ENOENT);
+	}
+
+	img->dev = ++imgs_count;
+	return img;
+}
+
+int erofs_add_img(const char *path)
+{
+	struct erofs_img *img = erofs_get_img(path);
+
+	if (IS_ERR(img))
+		return PTR_ERR(img);
+
+	list_add_tail(&img->list, &imgs_list);
+	return 0;
+}
+
+void erofs_cleanup_imgs(void)
+{
+	struct erofs_img *img, *n;
+
+	list_for_each_entry_safe(img, n, &imgs_list, list) {
+		list_del(&img->list);
+		free(img->path);
+		free(img);
+	}
+	imgs_count = 0;
+}
-- 
2.19.1.6.gb485710b


  parent reply	other threads:[~2023-08-02  9:18 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-08-02  9:17 [PATCH v2 01/16] erofs-utils: fix tar.h Jingbo Xu
2023-08-02  9:17 ` [PATCH v2 02/16] erofs-utils: lib: add list_splice_tail() helper Jingbo Xu
2023-08-02  9:17 ` [PATCH v2 03/16] erofs-utils: lib: add bitops library Jingbo Xu
2023-08-02  9:17 ` [PATCH v2 04/16] erofs-utils: read i_ino in erofs_read_inode_from_disk() Jingbo Xu
2023-08-02  9:17 ` [PATCH v2 05/16] erofs-utils: read dis->blocks in erofs_init_devices() Jingbo Xu
2023-08-02  9:17 ` [PATCH v2 06/16] erofs-utils: add erofs_read_xattrs_from_disk() helper Jingbo Xu
2023-08-02  9:17 ` [PATCH v2 07/16] erofs-utils: add erofs_inode_tag_opaque() helper Jingbo Xu
2023-08-02  9:17 ` [PATCH v2 08/16] erofs-utils: add erofs_insert_ihash() helper Jingbo Xu
2023-08-02  9:17 ` [PATCH v2 09/16] erofs-utils: add erofs_rebuild_dump_tree() helper Jingbo Xu
2023-08-02  9:17 ` [PATCH v2 10/16] erofs-utils: add erofs_rebuild_get_dentry() helper Jingbo Xu
2023-08-02  9:17 ` [PATCH v2 11/16] erofs-utils: make erofs_get_unhashed_chunk() global Jingbo Xu
2023-08-02  9:17 ` Jingbo Xu [this message]
2023-08-02  9:17 ` [PATCH v2 13/16] erofs-utils: add erofs_rebuild_load_tree() helper Jingbo Xu
2023-08-02  9:17 ` [PATCH v2 14/16] erofs-utils: generate data block bitmap when loading tree Jingbo Xu
2023-08-02  9:17 ` [PATCH v2 15/16] erofs-utils: mkfs: add dependency on zlib_LIBS Jingbo Xu
2023-08-02  9:17 ` [PATCH v2 16/16] erofs-utils: mkfs: introduce rebuild mode Jingbo Xu

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230802091750.74181-12-jefflexu@linux.alibaba.com \
    --to=jefflexu@linux.alibaba.com \
    --cc=linux-erofs@lists.ozlabs.org \
    --cc=xiang@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox