tests: update expect file for u_direct_io

Signed-off-by: zhanchengbin <zhanchengbin1@huawei.com>
This commit is contained in:
zhanchengbin 2022-03-08 10:28:20 +08:00
parent ebcbd4c180
commit f609d7b91f
2 changed files with 80 additions and 1 deletions

View File

@ -0,0 +1,75 @@
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

View File

@ -1,6 +1,6 @@
Name: e2fsprogs
Version: 1.46.4
Release: 4
Release: 5
Summary: Second extended file system management tools
License: GPLv2+ and LGPLv2 and MIT
URL: http://e2fsprogs.sourceforge.net/
@ -15,6 +15,7 @@ Patch6: 0006-e2fsck-exit-journal-recovery-when-find-EIO-ENOMEM-er.patch
Patch7: 0007-e2fsck-exit-journal-recovery-when-jounral-superblock.patch
Patch8: 0008-e2fsck-add-env-param-E2FS_UNRELIABLE_IO-to-fi.patch
Patch9: 0009-e2mmpstatus.8.in-detele-filesystem-can-be-UUID-or-LA.patch
Patch10: 0010-tests-update-expect-file-for-u_direct_io.patch
BuildRequires: gcc pkgconfig texinfo
@ -137,6 +138,9 @@ exit 0
%{_mandir}/man8/*
%changelog
* Thu Feb 8 2022 zhanchengbin <zhanchengbin1@huawei.com> - 1.46.4-5
- tests: update expect file for u_direct_io
* Wed Mar 2 2022 zhanchengbin <zhanchengbin1@huawei.com> - 1.46.4-4
- e2mmpstatus.8.in: detele filesystem can be UUID or LABEL in manpage