|
 |
252946 |
From fc9ed72f64b0e6689eaed1faa33e3a333b995bf7 Mon Sep 17 00:00:00 2001
|
|
|
252946 |
From: Kazuya Mio <k-mio@sx.jp.nec.com>
|
|
|
252946 |
Date: Sat, 17 Mar 2018 14:56:15 -0400
|
|
|
252946 |
Subject: [PATCH 05/16] libext2fs: fix ext2fs_open2() error for meta_bg image
|
|
|
252946 |
file
|
|
|
252946 |
|
|
|
252946 |
commit 8b061a641dff1a0becf645f8e6002de79b997b95
|
|
|
252946 |
|
|
|
252946 |
dumpe2fs/debugfs can examine the image file by using the -i option.
|
|
|
252946 |
However, if meta_bg feature is enabled, dumpe2fs/debugfs cannot open
|
|
|
252946 |
the image file.
|
|
|
252946 |
|
|
|
252946 |
$ dumpe2fs -i test.img
|
|
|
252946 |
dumpe2fs: Attempt to read block from filesystem resulted in short read while trying to open test.img
|
|
|
252946 |
Couldn't find valid filesystem superblock.
|
|
|
252946 |
|
|
|
252946 |
In case of specifying an image file, the location of block group descriptors
|
|
|
252946 |
is the same as the case of default filesystem regardless of meta_bg feature.
|
|
|
252946 |
So if EXT2_FLAG_IMAGE_FILE flag is set in ext2fs_open2(),
|
|
|
252946 |
don't use the meta_bg handling.
|
|
|
252946 |
|
|
|
252946 |
Signed-off-by: Kazuya Mio <k-mio@sx.jp.nec.com>
|
|
|
252946 |
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
|
|
|
252946 |
---
|
|
|
252946 |
lib/ext2fs/openfs.c | 3 ++-
|
|
|
252946 |
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
252946 |
|
|
|
252946 |
diff --git a/lib/ext2fs/openfs.c b/lib/ext2fs/openfs.c
|
|
|
252946 |
index ba501e6a..200f7815 100644
|
|
|
252946 |
--- a/lib/ext2fs/openfs.c
|
|
|
252946 |
+++ b/lib/ext2fs/openfs.c
|
|
|
252946 |
@@ -378,7 +378,8 @@ errcode_t ext2fs_open2(const char *name, const char *io_options,
|
|
|
252946 |
#ifdef WORDS_BIGENDIAN
|
|
|
252946 |
groups_per_block = EXT2_DESC_PER_BLOCK(fs->super);
|
|
|
252946 |
#endif
|
|
|
252946 |
- if (fs->super->s_feature_incompat & EXT2_FEATURE_INCOMPAT_META_BG) {
|
|
|
252946 |
+ if ((fs->super->s_feature_incompat & EXT2_FEATURE_INCOMPAT_META_BG) &&
|
|
|
252946 |
+ !(flags & EXT2_FLAG_IMAGE_FILE)) {
|
|
|
252946 |
first_meta_bg = fs->super->s_first_meta_bg;
|
|
|
252946 |
if (first_meta_bg > fs->desc_blocks)
|
|
|
252946 |
first_meta_bg = fs->desc_blocks;
|
|
|
252946 |
--
|
|
|
252946 |
2.20.1
|
|
|
252946 |
|