aboutsummaryrefslogtreecommitdiffstats
path: root/misc
diff options
context:
space:
mode:
authorTheodore Ts'o <tytso@mit.edu>2013-12-25 22:53:00 -0500
committerTheodore Ts'o <tytso@mit.edu>2013-12-26 00:21:13 -0500
commit7fcaabf8e80031b9919128c7cb8a86fdbcacb8f4 (patch)
tree755a0157c92d47594a88a81dcda4e8f2d2d48e7b /misc
parent737a88673d709d5b1375d589f790367121a59a42 (diff)
downloadandroid_external_e2fsprogs-7fcaabf8e80031b9919128c7cb8a86fdbcacb8f4.tar.gz
android_external_e2fsprogs-7fcaabf8e80031b9919128c7cb8a86fdbcacb8f4.tar.bz2
android_external_e2fsprogs-7fcaabf8e80031b9919128c7cb8a86fdbcacb8f4.zip
dumpe2fs: don't try to print the journal info when using image files
If dumpe2fs tries to print journal info when using an image file created using e2image, it will crash since the journal isn't available. So don't even try to print it. Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Diffstat (limited to 'misc')
-rw-r--r--misc/dumpe2fs.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/misc/dumpe2fs.c b/misc/dumpe2fs.c
index cb59f412..d4bde8e5 100644
--- a/misc/dumpe2fs.c
+++ b/misc/dumpe2fs.c
@@ -337,6 +337,8 @@ static void print_inline_journal_information(ext2_filsys fs)
__u32 *mask_ptr, mask, m;
int i, j, size, printed = 0;
+ if (fs->flags & EXT2_FLAG_IMAGE_FILE)
+ return;
retval = ext2fs_read_inode(fs, ino, &inode);
if (retval) {
com_err(program_name, retval, "%s",