commit: 67a186b9fc4fbcfc8aeea27180799108497b3110 Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at> AuthorDate: Sat Jan 21 11:38:08 2023 +0000 Commit: WANG Xuerui <xen0n <AT> gentoo <DOT> org> CommitDate: Sat Jan 21 13:53:22 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=67a186b9
sys-fs/erofs-utils: remove unused patch(es) Closes: https://github.com/gentoo/gentoo/pull/29204 Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at> Signed-off-by: WANG Xuerui <xen0n <AT> gentoo.org> .../files/1.4-dump-fix-de-nid-issues.patch | 134 --------------------- .../files/1.4-fsck-add-missing-include.patch | 31 ----- sys-fs/erofs-utils/files/1.4-werror.patch | 63 ---------- 3 files changed, 228 deletions(-) diff --git a/sys-fs/erofs-utils/files/1.4-dump-fix-de-nid-issues.patch b/sys-fs/erofs-utils/files/1.4-dump-fix-de-nid-issues.patch deleted file mode 100644 index 4c833d737fa2..000000000000 --- a/sys-fs/erofs-utils/files/1.4-dump-fix-de-nid-issues.patch +++ /dev/null @@ -1,134 +0,0 @@ -From 35b15cc9c75cc2d7782f36433bad90326e9cb060 Mon Sep 17 00:00:00 2001 -From: Gao Xiang <[email protected]> -Date: Mon, 22 Nov 2021 07:48:48 +0800 -Subject: [PATCH 1/2] erofs-utils: dump: fix de->nid issues - -As David Michael reported, " - In file included from main.c:11: - main.c: In function 'erofs_checkdirent': - ../include/erofs/print.h:68:25: error: format '%llu' expects argument of type 'long long unsigned int', but argument 3 has type '__le64' {aka 'long unsigned int'} [-Werror=format=] - 68 | "<E> " PR_FMT_FUNC_LINE(fmt), \ - | ^~~~~~ - main.c:264:17: note: in expansion of macro 'erofs_err' - 264 | erofs_err("invalid file type %llu", de->nid); - | ^~~~~~~~~ - main.c: In function 'erofs_read_dirent': - ../include/erofs/print.h:68:25: error: format '%llu' expects argument of type 'long long unsigned int', but argument 3 has type '__le64' {aka 'long unsigned int'} [-Werror=format=] - 68 | "<E> " PR_FMT_FUNC_LINE(fmt), \ - | ^~~~~~ - main.c:303:25: note: in expansion of macro 'erofs_err' - 303 | erofs_err("parse dir nid %llu error occurred\n", - | ^~~~~~~~~ - cc1: all warnings being treated as errors -" - -Also there are many de->nid lacking of endianness handling. -Should fix them together. - -Link: https://lore.kernel.org/r/[email protected] -Fixes: cf8be8a4352a ("erofs-utils: dump: add feature for collecting filesystem statistics") -Cc: Wang Qi <[email protected]> -Cc: Guo Xuenan <[email protected]> -Reported-by: David Michael <[email protected]> -Signed-off-by: Gao Xiang <[email protected]> ---- - dump/main.c | 31 ++++++++++++++++--------------- - 1 file changed, 16 insertions(+), 15 deletions(-) - -diff --git a/dump/main.c b/dump/main.c -index b7560ec..f85903b 100644 ---- a/dump/main.c -+++ b/dump/main.c -@@ -242,11 +242,12 @@ static inline int erofs_checkdirent(struct erofs_dirent *de, - { - int dname_len; - unsigned int nameoff = le16_to_cpu(de->nameoff); -+ erofs_nid_t nid = le64_to_cpu(de->nid); - - if (nameoff < sizeof(struct erofs_dirent) || - nameoff >= PAGE_SIZE) { - erofs_err("invalid de[0].nameoff %u @ nid %llu", -- nameoff, de->nid | 0ULL); -+ nameoff, nid | 0ULL); - return -EFSCORRUPTED; - } - -@@ -255,13 +256,12 @@ static inline int erofs_checkdirent(struct erofs_dirent *de, - /* a corrupted entry is found */ - if (nameoff + dname_len > maxsize || - dname_len > EROFS_NAME_LEN) { -- erofs_err("bogus dirent @ nid %llu", -- le64_to_cpu(de->nid) | 0ULL); -+ erofs_err("bogus dirent @ nid %llu", nid | 0ULL); - DBG_BUGON(1); - return -EFSCORRUPTED; - } - if (de->file_type >= EROFS_FT_MAX) { -- erofs_err("invalid file type %llu", de->nid); -+ erofs_err("invalid file type %llu", nid | 0ULL); - return -EFSCORRUPTED; - } - return dname_len; -@@ -273,7 +273,7 @@ static int erofs_read_dirent(struct erofs_dirent *de, - { - int err; - erofs_off_t occupied_size = 0; -- struct erofs_inode inode = { .nid = de->nid }; -+ struct erofs_inode inode = { .nid = le64_to_cpu(de->nid) }; - - stats.files++; - stats.file_category_stat[de->file_type]++; -@@ -296,12 +296,12 @@ static int erofs_read_dirent(struct erofs_dirent *de, - update_file_size_statatics(occupied_size, inode.i_size); - } - -- if ((de->file_type == EROFS_FT_DIR) -- && de->nid != nid && de->nid != parent_nid) { -- err = erofs_read_dir(de->nid, nid); -+ if (de->file_type == EROFS_FT_DIR && inode.nid != nid && -+ inode.nid != parent_nid) { -+ err = erofs_read_dir(inode.nid, nid); - if (err) { - erofs_err("parse dir nid %llu error occurred\n", -- de->nid); -+ inode.nid | 0ULL); - return err; - } - } -@@ -338,7 +338,8 @@ static int erofs_read_dir(erofs_nid_t nid, erofs_nid_t parent_nid) - int ret; - - /* skip "." and ".." dentry */ -- if (de->nid == nid || de->nid == parent_nid) { -+ if (le64_to_cpu(de->nid) == nid || -+ le64_to_cpu(de->nid) == parent_nid) { - de++; - continue; - } -@@ -399,18 +400,18 @@ static int erofs_get_pathname(erofs_nid_t nid, erofs_nid_t parent_nid, - if (len < 0) - return len; - -- if (de->nid == target) { -+ if (le64_to_cpu(de->nid) == target) { - memcpy(path + pos, dname, len); - path[pos + len] = '\0'; - return 0; - } - - if (de->file_type == EROFS_FT_DIR && -- de->nid != parent_nid && -- de->nid != nid) { -+ le64_to_cpu(de->nid) != parent_nid && -+ le64_to_cpu(de->nid) != nid) { - memcpy(path + pos, dname, len); -- err = erofs_get_pathname(de->nid, nid, -- target, path, pos + len); -+ err = erofs_get_pathname(le64_to_cpu(de->nid), -+ nid, target, path, pos + len); - if (!err) - return 0; - memset(path + pos, 0, len); --- -2.34.1 - diff --git a/sys-fs/erofs-utils/files/1.4-fsck-add-missing-include.patch b/sys-fs/erofs-utils/files/1.4-fsck-add-missing-include.patch deleted file mode 100644 index 8e4f6ac3d336..000000000000 --- a/sys-fs/erofs-utils/files/1.4-fsck-add-missing-include.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 2ac662b01de904802da4e84d0738e47bf573efde Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <[email protected]> -Date: Mon, 6 Dec 2021 20:14:03 +0100 -Subject: [PATCH 2/2] fsck/main.c: add missing include - -Otherwise musl C library builds fail with missing S_IFMT/S_IFDIR -definitions. - -Link: https://lore.kernel.org/r/[email protected] -Reviewed-by: Gao Xiang <[email protected]> -Signed-off-by: Alexander Kanavin <[email protected]> -Signed-off-by: Gao Xiang <[email protected]> ---- - fsck/main.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/fsck/main.c b/fsck/main.c -index aefa881..ad48e35 100644 ---- a/fsck/main.c -+++ b/fsck/main.c -@@ -6,6 +6,7 @@ - #include <stdlib.h> - #include <getopt.h> - #include <time.h> -+#include <sys/stat.h> - #include "erofs/print.h" - #include "erofs/io.h" - #include "erofs/decompress.h" --- -2.34.1 - diff --git a/sys-fs/erofs-utils/files/1.4-werror.patch b/sys-fs/erofs-utils/files/1.4-werror.patch deleted file mode 100644 index 21740d646c54..000000000000 --- a/sys-fs/erofs-utils/files/1.4-werror.patch +++ /dev/null @@ -1,63 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -11,7 +11,7 @@ AC_CONFIG_SRCDIR([config.h.in]) - AC_CONFIG_HEADERS([config.h]) - AC_CONFIG_MACRO_DIR([m4]) - AC_CONFIG_AUX_DIR(config) --AM_INIT_AUTOMAKE([foreign -Wall -Werror]) -+AM_INIT_AUTOMAKE([foreign -Wall]) - - # Checks for programs. - AM_PROG_AR ---- a/dump/Makefile.am -+++ b/dump/Makefile.am -@@ -5,6 +5,6 @@ AUTOMAKE_OPTIONS = foreign - bin_PROGRAMS = dump.erofs - AM_CPPFLAGS = ${libuuid_CFLAGS} - dump_erofs_SOURCES = main.c --dump_erofs_CFLAGS = -Wall -Werror -I$(top_srcdir)/include -+dump_erofs_CFLAGS = -Wall -I$(top_srcdir)/include - dump_erofs_LDADD = $(top_builddir)/lib/liberofs.la ${libselinux_LIBS} \ - ${libuuid_LIBS} ${liblz4_LIBS} ${liblzma_LIBS} ---- a/fsck/Makefile.am -+++ b/fsck/Makefile.am -@@ -5,6 +5,6 @@ AUTOMAKE_OPTIONS = foreign - bin_PROGRAMS = fsck.erofs - AM_CPPFLAGS = ${libuuid_CFLAGS} - fsck_erofs_SOURCES = main.c --fsck_erofs_CFLAGS = -Wall -Werror -I$(top_srcdir)/include -+fsck_erofs_CFLAGS = -Wall -I$(top_srcdir)/include - fsck_erofs_LDADD = $(top_builddir)/lib/liberofs.la ${libselinux_LIBS} \ - ${libuuid_LIBS} ${liblz4_LIBS} ${liblzma_LIBS} ---- a/fuse/Makefile.am -+++ b/fuse/Makefile.am -@@ -3,7 +3,7 @@ - AUTOMAKE_OPTIONS = foreign - bin_PROGRAMS = erofsfuse - erofsfuse_SOURCES = dir.c main.c --erofsfuse_CFLAGS = -Wall -Werror -I$(top_srcdir)/include -+erofsfuse_CFLAGS = -Wall -I$(top_srcdir)/include - erofsfuse_CFLAGS += -DFUSE_USE_VERSION=26 ${libfuse_CFLAGS} ${libselinux_CFLAGS} - erofsfuse_LDADD = $(top_builddir)/lib/liberofs.la ${libfuse_LIBS} ${liblz4_LIBS} \ - ${libselinux_LIBS} ${liblzma_LIBS} ---- a/lib/Makefile.am -+++ b/lib/Makefile.am -@@ -27,7 +27,7 @@ noinst_HEADERS += compressor.h - liberofs_la_SOURCES = config.c io.c cache.c super.c inode.c xattr.c exclude.c \ - namei.c data.c compress.c compressor.c zmap.c decompress.c \ - compress_hints.c hashmap.c sha256.c blobchunk.c --liberofs_la_CFLAGS = -Wall -Werror -I$(top_srcdir)/include -+liberofs_la_CFLAGS = -Wall -I$(top_srcdir)/include - if ENABLE_LZ4 - liberofs_la_CFLAGS += ${LZ4_CFLAGS} - liberofs_la_SOURCES += compressor_lz4.c ---- a/mkfs/Makefile.am -+++ b/mkfs/Makefile.am -@@ -4,6 +4,6 @@ AUTOMAKE_OPTIONS = foreign - bin_PROGRAMS = mkfs.erofs - AM_CPPFLAGS = ${libuuid_CFLAGS} ${libselinux_CFLAGS} - mkfs_erofs_SOURCES = main.c --mkfs_erofs_CFLAGS = -Wall -Werror -I$(top_srcdir)/include -+mkfs_erofs_CFLAGS = -Wall -I$(top_srcdir)/include - mkfs_erofs_LDADD = ${libuuid_LIBS} $(top_builddir)/lib/liberofs.la ${libselinux_LIBS} \ - ${liblz4_LIBS} ${liblzma_LIBS}
