!134 update package to v1.46.5

From: @hifi521 
Reviewed-by: @liuzhiqiang26 
Signed-off-by: @liuzhiqiang26

0002-libss-add-newer-libreadline.so.8-to-dlopen-path.patch

@@ -1,30 +0,0 @@
-From 3d967e53033c85ad5d3af1a42efb2c4f7501c356 Mon Sep 17 00:00:00 2001
-From: Jan Kara <jack@suse.cz>
-Date: Fri, 20 Aug 2021 18:15:02 +0200
-Subject: [PATCH] libss: add newer libreadline.so.8 to dlopen path
-
-OpenSUSE Tumbleweed now has libreadline.so.8. Add it to the list of libs
-to look for.
-
-Signed-off-by: Jan Kara <jack@suse.cz>
-Signed-off-by: Theodore Ts'o <tytso@mit.edu>
----
- lib/ss/get_readline.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lib/ss/get_readline.c b/lib/ss/get_readline.c
-index 11c72b3..aa16157 100644
---- a/lib/ss/get_readline.c
-+++ b/lib/ss/get_readline.c
-@@ -37,7 +37,7 @@ static void ss_release_readline(ss_data *info)
- #endif
- 
- /* Libraries we will try to use for readline/editline functionality */
--#define DEFAULT_LIBPATH "libreadline.so.7:libreadline.so.6:libreadline.so.5:libreadline.so.4:libreadline.so:libedit.so.2:libedit.so:libeditline.so.0:libeditline.so"
-+#define DEFAULT_LIBPATH "libreadline.so.8:libreadline.so.7:libreadline.so.6:libreadline.so.5:libreadline.so.4:libreadline.so:libedit.so.2:libedit.so:libeditline.so.0:libeditline.so"
- 
- #ifdef HAVE_DLOPEN
- void ss_get_readline(int sci_idx)
--- 
-2.14.3 (Apple Git-98)
-

0003-tests-update-expect-files-for-f_mmp_garbage.patch

@@ -1,41 +0,0 @@
-From 8b2beb24819a976f575e8cec04e3fe6ca8851017 Mon Sep 17 00:00:00 2001
-From: Lukas Czerner <lczerner@redhat.com>
-Date: Tue, 24 Aug 2021 14:10:19 +0200
-Subject: [PATCH] tests: update expect files for f_mmp_garbage
-
-Update expect file for f_mmp_garbage test to work correctly with the
-new default 256 inode size.
-
-Fixes: d730be5ceeba ("tests: update mke2fs.conf to create 256 byte inodes by default")
-Signed-off-by: Lukas Czerner <lczerner@redhat.com>
-Signed-off-by: Theodore Ts'o <tytso@mit.edu>
----
- tests/f_mmp_garbage/expect.1 | 2 +-
- tests/f_mmp_garbage/expect.2 | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/tests/f_mmp_garbage/expect.1 b/tests/f_mmp_garbage/expect.1
-index a8add10..4134eae 100644
---- a/tests/f_mmp_garbage/expect.1
-+++ b/tests/f_mmp_garbage/expect.1
-@@ -5,5 +5,5 @@ Pass 2: Checking directory structure
- Pass 3: Checking directory connectivity
- Pass 4: Checking reference counts
- Pass 5: Checking group summary information
--test_filesys: 11/64 files (0.0% non-contiguous), 13/100 blocks
-+test_filesys: 11/64 files (0.0% non-contiguous), 15/100 blocks
- Exit status is 0
-diff --git a/tests/f_mmp_garbage/expect.2 b/tests/f_mmp_garbage/expect.2
-index 6630002..3bca182 100644
---- a/tests/f_mmp_garbage/expect.2
-+++ b/tests/f_mmp_garbage/expect.2
-@@ -3,5 +3,5 @@ Pass 2: Checking directory structure
- Pass 3: Checking directory connectivity
- Pass 4: Checking reference counts
- Pass 5: Checking group summary information
--test_filesys: 11/64 files (0.0% non-contiguous), 13/100 blocks
-+test_filesys: 11/64 files (0.0% non-contiguous), 15/100 blocks
- Exit status is 0
--- 
-1.8.3.1
-

0004-tests-update-expect-files-for-f_large_dir-and-f_larg.patch

@@ -1,38 +0,0 @@
-From da33289073de254ab4bacb80b1b83cf9d27c76ea Mon Sep 17 00:00:00 2001
-From: Lukas Czerner <lczerner@redhat.com>
-Date: Tue, 24 Aug 2021 14:10:20 +0200
-Subject: [PATCH] tests: update expect files for f_large_dir and
- f_large_dir_csum
-
-Update expect files for f_large_dir and f_large_dir_csum tests to
-include the warning about missing y2038 support with 128-byte inodes.
-
-Fixes: a23b50cd ("mke2fs: warn about missing y2038 support when formatting fresh ext4 fs")
-Signed-off-by: Lukas Czerner <lczerner@redhat.com>
-Signed-off-by: Theodore Ts'o <tytso@mit.edu>
----
- tests/f_large_dir/expect      | 1 +
- tests/f_large_dir_csum/expect | 1 +
- 2 files changed, 2 insertions(+)
-
-diff --git a/tests/f_large_dir/expect b/tests/f_large_dir/expect
-index 028234c..495ea85 100644
---- a/tests/f_large_dir/expect
-+++ b/tests/f_large_dir/expect
-@@ -1,3 +1,4 @@
-+128-byte inodes cannot handle dates beyond 2038 and are deprecated
- Creating filesystem with 108341 1k blocks and 65072 inodes
- Superblock backups stored on blocks: 
- 	8193, 24577, 40961, 57345, 73729
-diff --git a/tests/f_large_dir_csum/expect b/tests/f_large_dir_csum/expect
-index aa9f33f..44770f7 100644
---- a/tests/f_large_dir_csum/expect
-+++ b/tests/f_large_dir_csum/expect
-@@ -1,3 +1,4 @@
-+128-byte inodes cannot handle dates beyond 2038 and are deprecated
- Creating filesystem with 31002 1k blocks and 64 inodes
- Superblock backups stored on blocks: 
- 	8193, 24577
--- 
-1.8.3.1
-

0010-tests-update-expect-file-for-u_direct_io.patch

@@ -1,75 +0,0 @@
-From 4cda25453f85f06371735b8f55d584e0d38a52bc Mon Sep 17 00:00:00 2001
-From: Theodore Ts'o <tytso@mit.edu>
-Date: Sun, 22 Aug 2021 10:07:15 -0400
-Subject: [PATCH] tests: update expect file for u_direct_io
-
-The u_direct_io test is normally not run (since it requires root
-privileges); as a result, when the mke2fs.conf defaults were changed,
-I didn't notice that the expected output for u_direct_io test needed
-to be updated.
-
-Fixes: d730be5ceeba ("tests: update mke2fs.conf to create 256 byte inodes by default"
-Signed-off-by: Theodore Ts'o <tytso@mit.edu>
----
- tests/u_direct_io/expect | 16 +++++++++-------
- 1 file changed, 9 insertions(+), 7 deletions(-)
-
-diff --git a/tests/u_direct_io/expect b/tests/u_direct_io/expect
-index b0cdc73..830cbd7 100644
---- a/tests/u_direct_io/expect
-+++ b/tests/u_direct_io/expect
-@@ -19,8 +19,8 @@ Filesystem OS type:       Linux
- Inode count:              32768
- Block count:              32768
- Reserved block count:     1638
--Overhead clusters:        5131
--Free blocks:              27631
-+Overhead clusters:        6155
-+Free blocks:              26607
- Free inodes:              32757
- First block:              0
- Block size:               4096
-@@ -29,27 +29,29 @@ Reserved GDT blocks:      7
- Blocks per group:         32768
- Fragments per group:      32768
- Inodes per group:         32768
--Inode blocks per group:   1024
-+Inode blocks per group:   2048
- Flex block group size:    16
- Mount count:              0
- Check interval:           15552000 (6 months)
- Reserved blocks uid:      0
- Reserved blocks gid:      0
- First inode:              11
--Inode size:	          128
-+Inode size:	          256
-+Required extra isize:     32
-+Desired extra isize:      32
- Journal inode:            8
- Default directory hash:   half_md4
- Journal backup:           inode blocks
- Directories:              2
-  Group  0: block bitmap at 9, inode bitmap at 25, inode table at 41
--           27631 free blocks, 32757 free inodes, 2 used directories
-+           26607 free blocks, 32757 free inodes, 2 used directories
- e2fsck -fn -N test_filesys $LOOP
- Pass 1: Checking inodes, blocks, and sizes
- Pass 2: Checking directory structure
- Pass 3: Checking directory connectivity
- Pass 4: Checking reference counts
- Pass 5: Checking group summary information
--test_filesys: 11/32768 files (9.1% non-contiguous), 5137/32768 blocks
-+test_filesys: 11/32768 files (9.1% non-contiguous), 6161/32768 blocks
- Exit status is 0
- e2fsck -fn -N test_filesys $TMPFILE
- Pass 1: Checking inodes, blocks, and sizes
-@@ -57,5 +59,5 @@ Pass 2: Checking directory structure
- Pass 3: Checking directory connectivity
- Pass 4: Checking reference counts
- Pass 5: Checking group summary information
--test_filesys: 11/32768 files (9.1% non-contiguous), 5137/32768 blocks
-+test_filesys: 11/32768 files (9.1% non-contiguous), 6161/32768 blocks
- Exit status is 0
--- 
-1.8.3.1
-

0011-libext2fs-don-t-old-the-CACHE_MTX-while-doing-I-O.patch

@@ -1,106 +0,0 @@
-From 699d448eee4b991acafaae4e4f8222be332d6837 Mon Sep 17 00:00:00 2001
-From: Theodore Ts'o <tytso@mit.edu>
-Date: Thu, 9 Dec 2021 10:55:54 -0500
-Subject: [PATCH] libext2fs: don't old the CACHE_MTX while doing I/O
-
-A report a deadlock problem caused by I/O errors (caused by e2fsck's
-error handler trying to write to a bad block to perform a forced
-rewrite) uncovered that we were holding the CACHE_MTX while doing read
-operations.  This serialized read operations which destroyed the
-performance benefits from doing parallel bitmap loading (or the
-parallel e2fsck processing under development).
-
-So restructure the code in unix_read_blk64() so that the read is
-always done into the user-provided buffer, and then copied into the
-cache afterwards.
-
-Signed-off-by: Theodore Ts'o <tytso@mit.edu>
----
- lib/ext2fs/unix_io.c | 38 +++++++++++++-------------------------
- 1 file changed, 13 insertions(+), 25 deletions(-)
-
-diff --git a/lib/ext2fs/unix_io.c b/lib/ext2fs/unix_io.c
-index 50ac737..e53db33 100644
---- a/lib/ext2fs/unix_io.c
-+++ b/lib/ext2fs/unix_io.c
-@@ -977,8 +977,8 @@ static errcode_t unix_read_blk64(io_channel channel, unsigned long long block,
- 			       int count, void *buf)
- {
- 	struct unix_private_data *data;
--	struct unix_cache *cache, *reuse[READ_DIRECT_SIZE];
--	errcode_t	retval = 0;
-+	struct unix_cache *cache;
-+	errcode_t	retval;
- 	char		*cp;
- 	int		i, j;
- 
-@@ -1005,7 +1005,7 @@ static errcode_t unix_read_blk64(io_channel channel, unsigned long long block,
- 	mutex_lock(data, CACHE_MTX);
- 	while (count > 0) {
- 		/* If it's in the cache, use it! */
--		if ((cache = find_cached_block(data, block, &reuse[0]))) {
-+		if ((cache = find_cached_block(data, block, NULL))) {
- #ifdef DEBUG
- 			printf("Using cached block %lu\n", block);
- #endif
-@@ -1015,47 +1015,35 @@ static errcode_t unix_read_blk64(io_channel channel, unsigned long long block,
- 			cp += channel->block_size;
- 			continue;
- 		}
--		if (count == 1) {
--			/*
--			 * Special case where we read directly into the
--			 * cache buffer; important in the O_DIRECT case
--			 */
--			cache = reuse[0];
--			reuse_cache(channel, data, cache, block);
--			if ((retval = raw_read_blk(channel, data, block, 1,
--						   cache->buf))) {
--				cache->in_use = 0;
--				break;
--			}
--			memcpy(cp, cache->buf, channel->block_size);
--			retval = 0;
--			break;
--		}
- 
- 		/*
- 		 * Find the number of uncached blocks so we can do a
- 		 * single read request
- 		 */
- 		for (i=1; i < count; i++)
--			if (find_cached_block(data, block+i, &reuse[i]))
-+			if (find_cached_block(data, block+i, NULL))
- 				break;
- #ifdef DEBUG
- 		printf("Reading %d blocks starting at %lu\n", i, block);
- #endif
-+		mutex_unlock(data, CACHE_MTX);
- 		if ((retval = raw_read_blk(channel, data, block, i, cp)))
--			break;
-+			return retval;
-+		mutex_lock(data, CACHE_MTX);
- 
- 		/* Save the results in the cache */
- 		for (j=0; j < i; j++) {
-+			if (!find_cached_block(data, block, &cache)) {
-+				reuse_cache(channel, data, cache, block);
-+				memcpy(cache->buf, cp, channel->block_size);
-+			}
- 			count--;
--			cache = reuse[j];
--			reuse_cache(channel, data, cache, block++);
--			memcpy(cache->buf, cp, channel->block_size);
-+			block++;
- 			cp += channel->block_size;
- 		}
- 	}
- 	mutex_unlock(data, CACHE_MTX);
--	return retval;
-+	return 0;
- #endif /* NO_IO_CACHE */
- }
- 
--- 
-1.8.3.1
-

e2fsprogs.spec

@@ -1,6 +1,6 @@
 Name:           e2fsprogs
-Version:        1.46.4
+Version:        1.46.5
-Release:        16
+Release:        1
 Summary:        Second extended file system management tools
 License:        GPLv2+ and LGPLv2 and MIT
 URL:            http://e2fsprogs.sourceforge.net/
@@ -8,26 +8,21 @@ Source0:        https://www.kernel.org/pub/linux/kernel/people/tytso/%{name}/v%{
 Source1:        ext2_types-wrapper.h
 
 Patch1:		0001-e2fsprogs-set-hugefile-from-4T-to-1T-in-hugefile-tes.patch
-Patch2:		0002-libss-add-newer-libreadline.so.8-to-dlopen-path.patch
+Patch2:		0002-resize2fs-resize2fs-disk-hardlinks-will-be-error.patch
-Patch3:		0003-tests-update-expect-files-for-f_mmp_garbage.patch
+Patch3:		0003-e2fsck-exit-journal-recovery-when-find-EIO-ENOMEM-er.patch
-Patch4:		0004-tests-update-expect-files-for-f_large_dir-and-f_larg.patch
+Patch4:		0004-e2fsck-exit-journal-recovery-when-jounral-superblock.patch
-Patch5:		0005-resize2fs-resize2fs-disk-hardlinks-will-be-error.patch
+Patch5:		0005-e2fsck-add-env-param-E2FS_UNRELIABLE_IO-to-fi.patch
-Patch6:		0006-e2fsck-exit-journal-recovery-when-find-EIO-ENOMEM-er.patch
+Patch6:		0006-e2mmpstatus.8.in-detele-filesystem-can-be-UUID-or-LA.patch
-Patch7:		0007-e2fsck-exit-journal-recovery-when-jounral-superblock.patch
+Patch7:		0007-tests-fix-ACL-printing-tests.patch
-Patch8:		0008-e2fsck-add-env-param-E2FS_UNRELIABLE_IO-to-fi.patch
+Patch8:		0008-e2fsck-do-not-clean-up-file-acl-if-the-inode-is-trun.patch
-Patch9:		0009-e2mmpstatus.8.in-detele-filesystem-can-be-UUID-or-LA.patch		
+Patch9:		0009-e2fsck-handle-level-is-overflow-in-ext2fs_extent_get.patch
-Patch10:	0010-tests-update-expect-file-for-u_direct_io.patch
+Patch10:	0010-libext2fs-add-sanity-check-to-extent-manipulation.patch
-Patch11:	0011-libext2fs-don-t-old-the-CACHE_MTX-while-doing-I-O.patch
+Patch11:	0011-e2fsprogs-add-sw64.patch
-Patch12:	0012-tests-fix-ACL-printing-tests.patch
+Patch12:	0012-tune2fs-do-not-change-j_tail_sequence-in-journal-sup.patch
-Patch13:	0013-e2fsck-do-not-clean-up-file-acl-if-the-inode-is-trun.patch
+Patch13:	0013-debugfs-teach-logdump-the-n-num_trans-option.patch
-Patch14:	0014-e2fsck-handle-level-is-overflow-in-ext2fs_extent_get.patch
+Patch14:	0014-tune2fs-fix-tune2fs-segfault-when-ext2fs_run_ext3_jo.patch
-Patch15:	0015-libext2fs-add-sanity-check-to-extent-manipulation.patch
+Patch15:	0015-tune2fs-tune2fs_main-should-return-rc-when-some-erro.patch
-Patch16:        0016-e2fsprogs-add-sw64.patch
+Patch16:	0016-tune2fs-exit-directly-when-fs-freed-in-ext2fs_run_ext3_journal.patch
-Patch17:	0017-tune2fs-do-not-change-j_tail_sequence-in-journal-sup.patch
-Patch18:	0018-debugfs-teach-logdump-the-n-num_trans-option.patch
-Patch19:	0019-tune2fs-fix-tune2fs-segfault-when-ext2fs_run_ext3_jo.patch
-Patch20:	0020-tune2fs-tune2fs_main-should-return-rc-when-some-erro.patch
-Patch21:	0021-tune2fs-exit-directly-when-fs-freed-in-ext2fs_run_ext3_journal.patch
 
 
 BuildRequires:  gcc pkgconfig texinfo
@@ -169,6 +164,9 @@ exit 0
 %{_mandir}/man8/*
 
 %changelog
+* Wed Oct 19 2022 zhanchengbin <zhanchengbin1@huawei.com> - 1.46.5-1
+- update package to v1.46.5.
+
 * Fri Oct 14 2022 Zhiqiang Liu <liuzhiqiang26@huawei.com> - 1.46.4-16
 - tune2fs: fix segfault problem