aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorTheodore Ts'o <tytso@mit.edu>2012-03-21 23:40:24 -0400
committerTheodore Ts'o <tytso@mit.edu>2012-03-21 23:40:24 -0400
commit010c49cf499738c7a06de13077f31f2a12ecadeb (patch)
tree29bacbd072627bebcb93fe6218cfb4223683cfc2 /tests
parent349b8a37c5077086f1cd57c6b1b13ec275af6a43 (diff)
downloade2fsprogs-010c49cf499738c7a06de13077f31f2a12ecadeb.tar.gz
e2fsprogs-010c49cf499738c7a06de13077f31f2a12ecadeb.tar.xz
e2fsprogs-010c49cf499738c7a06de13077f31f2a12ecadeb.zip
e2fsck: report ext2fs_open2() and ext2fs_check_desc() errors
Print the actual errors returned by ext2fs_open2() and ext2fs_check_desc() before we fall back to the backup block group descriptors so that it's easier to see if there is some obscure failure that is causing e2fsck to think that it should use the backup block group descriptors. Addresses-Google-Bug: #6208183 Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Diffstat (limited to 'tests')
-rw-r--r--tests/f_crashdisk/expect.11
-rw-r--r--tests/f_illbbitmap/expect.11
-rw-r--r--tests/f_illibitmap/expect.11
-rw-r--r--tests/f_illitable/expect.11
-rw-r--r--tests/f_illitable_flexbg/expect.11
-rw-r--r--tests/f_miss_blk_bmap/expect.11
-rw-r--r--tests/f_misstable/expect.11
-rw-r--r--tests/f_overfsblks/expect.11
-rw-r--r--tests/f_resize_inode/expect1
-rw-r--r--tests/f_zero_group/expect.11
-rw-r--r--tests/f_zero_inode_size/expect.11
-rw-r--r--tests/f_zero_super/expect.11
12 files changed, 12 insertions, 0 deletions
diff --git a/tests/f_crashdisk/expect.1 b/tests/f_crashdisk/expect.1
index 132d49af..70ddf2ec 100644
--- a/tests/f_crashdisk/expect.1
+++ b/tests/f_crashdisk/expect.1
@@ -1,3 +1,4 @@
+ext2fs_open2: The ext2 superblock is corrupt
../e2fsck/e2fsck: Superblock invalid, trying backup blocks...
../e2fsck/e2fsck: The ext2 superblock is corrupt while trying to open test.img
diff --git a/tests/f_illbbitmap/expect.1 b/tests/f_illbbitmap/expect.1
index ae61bf52..8746d23a 100644
--- a/tests/f_illbbitmap/expect.1
+++ b/tests/f_illbbitmap/expect.1
@@ -1,3 +1,4 @@
+ext2fs_check_desc: Corrupt group descriptor: bad block for block bitmap
Note: if several inode or block bitmap blocks or part
of the inode table require relocation, you may wish to try
running e2fsck with the '-b 8193' option first. The problem
diff --git a/tests/f_illibitmap/expect.1 b/tests/f_illibitmap/expect.1
index 2ed55b67..5bae25d1 100644
--- a/tests/f_illibitmap/expect.1
+++ b/tests/f_illibitmap/expect.1
@@ -1,3 +1,4 @@
+ext2fs_check_desc: Corrupt group descriptor: bad block for inode bitmap
Note: if several inode or block bitmap blocks or part
of the inode table require relocation, you may wish to try
running e2fsck with the '-b 8193' option first. The problem
diff --git a/tests/f_illitable/expect.1 b/tests/f_illitable/expect.1
index fbb3aefa..552a2e79 100644
--- a/tests/f_illitable/expect.1
+++ b/tests/f_illitable/expect.1
@@ -1,3 +1,4 @@
+ext2fs_check_desc: Corrupt group descriptor: bad block for inode table
Note: if several inode or block bitmap blocks or part
of the inode table require relocation, you may wish to try
running e2fsck with the '-b 8193' option first. The problem
diff --git a/tests/f_illitable_flexbg/expect.1 b/tests/f_illitable_flexbg/expect.1
index 2d547285..fa42a0f8 100644
--- a/tests/f_illitable_flexbg/expect.1
+++ b/tests/f_illitable_flexbg/expect.1
@@ -1,3 +1,4 @@
+ext2fs_check_desc: Corrupt group descriptor: bad block for inode table
../e2fsck/e2fsck: Group descriptors look bad... trying backup blocks...
Inode table for group 1 is not in group. (block 0)
WARNING: SEVERE DATA LOSS POSSIBLE.
diff --git a/tests/f_miss_blk_bmap/expect.1 b/tests/f_miss_blk_bmap/expect.1
index 4c51a16e..998b61ad 100644
--- a/tests/f_miss_blk_bmap/expect.1
+++ b/tests/f_miss_blk_bmap/expect.1
@@ -1,3 +1,4 @@
+ext2fs_check_desc: Corrupt group descriptor: bad block for block bitmap
Pass 1: Checking inodes, blocks, and sizes
Relocating group 0's block bitmap to 2...
Pass 2: Checking directory structure
diff --git a/tests/f_misstable/expect.1 b/tests/f_misstable/expect.1
index 93d4e899..a8cf264e 100644
--- a/tests/f_misstable/expect.1
+++ b/tests/f_misstable/expect.1
@@ -1,3 +1,4 @@
+ext2fs_check_desc: Corrupt group descriptor: bad block for inode table
../e2fsck/e2fsck: Group descriptors look bad... trying backup blocks...
Inode table for group 1 is not in group. (block 0)
WARNING: SEVERE DATA LOSS POSSIBLE.
diff --git a/tests/f_overfsblks/expect.1 b/tests/f_overfsblks/expect.1
index 60f77d55..e5b93f0d 100644
--- a/tests/f_overfsblks/expect.1
+++ b/tests/f_overfsblks/expect.1
@@ -1,3 +1,4 @@
+ext2fs_check_desc: Corrupt group descriptor: bad block for inode bitmap
Filesystem did not have a UUID; generating one.
Pass 1: Checking inodes, blocks, and sizes
diff --git a/tests/f_resize_inode/expect b/tests/f_resize_inode/expect
index a396927c..84618d4d 100644
--- a/tests/f_resize_inode/expect
+++ b/tests/f_resize_inode/expect
@@ -113,6 +113,7 @@ Exit status is 0
debugfs -R ''set_super_value reserved_gdt_blocks 15679'' -w test.img
Exit status is 0
+ext2fs_check_desc: Corrupt group descriptor: bad block for block bitmap
../e2fsck/e2fsck: Group descriptors look bad... trying backup blocks...
Pass 1: Checking inodes, blocks, and sizes
Pass 2: Checking directory structure
diff --git a/tests/f_zero_group/expect.1 b/tests/f_zero_group/expect.1
index 577dadd4..2a077674 100644
--- a/tests/f_zero_group/expect.1
+++ b/tests/f_zero_group/expect.1
@@ -1,3 +1,4 @@
+ext2fs_check_desc: Corrupt group descriptor: bad block for block bitmap
../e2fsck/e2fsck: Group descriptors look bad... trying backup blocks...
Pass 1: Checking inodes, blocks, and sizes
Pass 2: Checking directory structure
diff --git a/tests/f_zero_inode_size/expect.1 b/tests/f_zero_inode_size/expect.1
index 9202131f..b8bd7da2 100644
--- a/tests/f_zero_inode_size/expect.1
+++ b/tests/f_zero_inode_size/expect.1
@@ -1,3 +1,4 @@
+ext2fs_open2: The ext2 superblock is corrupt
../e2fsck/e2fsck: Superblock invalid, trying backup blocks...
Pass 1: Checking inodes, blocks, and sizes
Pass 2: Checking directory structure
diff --git a/tests/f_zero_super/expect.1 b/tests/f_zero_super/expect.1
index 029f3f14..e2b954d0 100644
--- a/tests/f_zero_super/expect.1
+++ b/tests/f_zero_super/expect.1
@@ -1,3 +1,4 @@
+ext2fs_open2: Bad magic number in super-block
../e2fsck/e2fsck: Superblock invalid, trying backup blocks...
Pass 1: Checking inodes, blocks, and sizes
Pass 2: Checking directory structure