From 83d48735c19632249aeacdf93f76bd86748a5445 Mon Sep 17 00:00:00 2001 From: Theodore Ts'o Date: Sat, 27 Apr 2024 23:22:29 -0400 Subject: [PATCH] Remove debian/patches for v1.47.1-rc1 release Signed-off-by: Theodore Ts'o --- ...f-a-invalid-symlink-in-an-inline-dir.patch | 39 ------------ ...-dumpe2fs-to-report-free-block-range.patch | 63 ------------------- debian/patches/series | 3 - ...-file-is-clean-message-in-preen-mode.patch | 51 --------------- 4 files changed, 156 deletions(-) delete mode 100644 debian/patches/e2fsck-fix-handling-of-a-invalid-symlink-in-an-inline-dir.patch delete mode 100644 debian/patches/modify-dumpe2fs-to-report-free-block-range.patch delete mode 100644 debian/patches/series delete mode 100644 debian/patches/suppress-orphan-file-is-clean-message-in-preen-mode.patch diff --git a/debian/patches/e2fsck-fix-handling-of-a-invalid-symlink-in-an-inline-dir.patch b/debian/patches/e2fsck-fix-handling-of-a-invalid-symlink-in-an-inline-dir.patch deleted file mode 100644 index 162e0fc91..000000000 --- a/debian/patches/e2fsck-fix-handling-of-a-invalid-symlink-in-an-inline-dir.patch +++ /dev/null @@ -1,39 +0,0 @@ -From: Theodore Ts'o -Description: e2fsck: fix handling of a invalid symlink in an inline_data directory - . - If there is an inline directory that contains a directory entry to an - invalid symlink, and that invalid symlink is the portion of the inline - directory stored in an xattr portion of the inode, this can result in - a buffer overrun. - . - When check_dir_block() is handling the in-xattr portion of the inline - directory, it sets the buf pointer to the beginning of that part of - the inline directory. This results in the scratch buffer passed to - e2fsck_process_bad_inode() to incorrect, resulting in a buffer overrun - if e2fsck_pass1_check_symlink() needs to read the symlink target (when - the symlink is too long to fit in the i_blocks[] space). - . - This commit fixes this by using the original cd->buf instead of buf, - since it can get modified when handling inline directories. - . -Origin: upstream,https://git.kernel.org/pub/scm/fs/ext2/e2fsprogs.git/commit/?h=next&id=8798bbb81687103b0c0f56a42b096884c6032101 ---- - e2fsck/pass2.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/e2fsck/pass2.c b/e2fsck/pass2.c -index 47f9206f..42f3e5ef 100644 ---- a/e2fsck/pass2.c -+++ b/e2fsck/pass2.c -@@ -1523,7 +1523,7 @@ skip_checksum: - dirent->inode)) { - if (e2fsck_process_bad_inode(ctx, ino, - dirent->inode, -- buf + fs->blocksize)) { -+ cd->buf + fs->blocksize)) { - dirent->inode = 0; - dir_modified++; - goto next; --- -2.31.0 - diff --git a/debian/patches/modify-dumpe2fs-to-report-free-block-range.patch b/debian/patches/modify-dumpe2fs-to-report-free-block-range.patch deleted file mode 100644 index 5f1b1bbec..000000000 --- a/debian/patches/modify-dumpe2fs-to-report-free-block-range.patch +++ /dev/null @@ -1,63 +0,0 @@ -From: Eric Whitney -Description: modify dumpe2fs to report free block ranges for bigalloc - . - dumpe2fs has never been modified to correctly report block ranges - corresponding to free clusters in block allocation bitmaps from bigalloc - file systems. Rather than reporting block ranges covering all the - blocks in free clusters found in a block bitmap, it either reports just - the first block number in a cluster for a single free cluster, or a - range beginning with the first block number in the first cluster in a - series of free clusters, and ending with the first block number in the - last cluster in that series. - . - This behavior causes xfstest shared/298 to fail when run on a bigalloc - file system with a 1k block size. The test uses dumpe2fs to collect - a list of the blocks freed when files are deleted from a file system. - When the test deletes a file containing blocks located after the first - block in the last cluster in a series of clusters, dumpe2fs does not - report those blocks as free per the test's expectations. - . - Modify dumpe2fs to report full block ranges for free clusters. At the - same time, fix a small bug causing unnecessary !in_use() retests while - iterating over a block bitmap. -Origin: upstream,https://git.kernel.org/pub/scm/fs/ext2/e2fsprogs.git/commit/?h=next&id=b31d5b582b4189a0ed27bced22276dd3f68c50a7 ---- - misc/dumpe2fs.c | 12 ++++++------ - 1 file changed, 6 insertions(+), 6 deletions(-) - -diff --git a/misc/dumpe2fs.c b/misc/dumpe2fs.c -index 7c080ed9f..d2d57fb0a 100644 ---- a/misc/dumpe2fs.c -+++ b/misc/dumpe2fs.c -@@ -84,8 +84,7 @@ static void print_free(unsigned long group, char * bitmap, - unsigned long num, unsigned long offset, int ratio) - { - int p = 0; -- unsigned long i; -- unsigned long j; -+ unsigned long i, j; - - offset /= ratio; - offset += group * num; -@@ -95,13 +94,14 @@ static void print_free(unsigned long group, char * bitmap, - if (p) - printf (", "); - print_number((i + offset) * ratio); -- for (j = i; j < num && !in_use (bitmap, j); j++) -+ for (j = i + 1; j < num && !in_use(bitmap, j); j++) - ; -- if (--j != i) { -+ if (j != i + 1 || ratio > 1) { - fputc('-', stdout); -- print_number((j + offset) * ratio); -- i = j; -+ print_number(((j - 1 + offset) * ratio) + -+ ratio - 1); - } -+ i = j; - p = 1; - } - } --- -2.31.0 - diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index f9f117323..000000000 --- a/debian/patches/series +++ /dev/null @@ -1,3 +0,0 @@ -suppress-orphan-file-is-clean-message-in-preen-mode.patch -e2fsck-fix-handling-of-a-invalid-symlink-in-an-inline-dir.patch -modify-dumpe2fs-to-report-free-block-range.patch diff --git a/debian/patches/suppress-orphan-file-is-clean-message-in-preen-mode.patch b/debian/patches/suppress-orphan-file-is-clean-message-in-preen-mode.patch deleted file mode 100644 index 889235938..000000000 --- a/debian/patches/suppress-orphan-file-is-clean-message-in-preen-mode.patch +++ /dev/null @@ -1,51 +0,0 @@ -From: Theodore Ts'o -Description: e2fsck: Suppress "orphan file is clean" message in preen mode - . - The e2fsck report, "Feature orphan_present is set but orphan file is - clean" is intended to request permission before removing the r/o - compat feature, orphan_present. However, it is normal if the orphan - file is empty, and removing the r/o compat feature is a good thing so - that the file system can be mounted on older kernels. - . - When a file system with an orphan_file feature is mounted, the - orphan_present feature is set, and it is cleared when the file system - is cleanly unmounted. IF the sytstem crashes when there are no inodes - in the orphan file, e2fsck should just silently clear the flag in - preen mode. - . -Origin: upstream,https://git.kernel.org/pub/scm/fs/ext2/e2fsprogs.git/commit/?h=next&id=24a11cc371a46ca9e68aed8f2cf4aabd22ea81eb ---- - e2fsck/problem.c | 2 +- - e2fsck/super.c | 3 ++- - 2 files changed, 3 insertions(+), 2 deletions(-) - -diff --git a/e2fsck/problem.c b/e2fsck/problem.c -index 6ad6fb84..013ace24 100644 ---- a/e2fsck/problem.c -+++ b/e2fsck/problem.c -@@ -2327,7 +2327,7 @@ static struct e2fsck_problem problem_table[] = { - /* orphan_present set but orphan file is empty */ - { PR_6_ORPHAN_PRESENT_CLEAN_FILE, - N_("Feature orphan_present is set but orphan file is clean.\n"), -- PROMPT_CLEAR, PR_PREEN_OK }, -+ PROMPT_CLEAR, PR_PREEN_OK | PR_NO_OK | PR_PREEN_NOMSG }, - - /* orphan_present set but orphan_file is not */ - { PR_6_ORPHAN_PRESENT_NO_FILE, -diff --git a/e2fsck/super.c b/e2fsck/super.c -index 9495e029..be40dd8f 100644 ---- a/e2fsck/super.c -+++ b/e2fsck/super.c -@@ -1388,7 +1388,8 @@ void check_super_block(e2fsck_t ctx) - * away. - */ - #define FEATURE_RO_COMPAT_IGNORE (EXT2_FEATURE_RO_COMPAT_LARGE_FILE| \ -- EXT4_FEATURE_RO_COMPAT_DIR_NLINK) -+ EXT4_FEATURE_RO_COMPAT_DIR_NLINK| \ -+ EXT4_FEATURE_RO_COMPAT_ORPHAN_PRESENT) - #define FEATURE_INCOMPAT_IGNORE (EXT3_FEATURE_INCOMPAT_EXTENTS| \ - EXT3_FEATURE_INCOMPAT_RECOVER) - --- -2.31.0 -