diff options
| author | Andreas Dilger <adilger@dilger.ca> | 2013-12-03 20:02:12 -0500 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2013-12-03 20:22:16 -0500 |
| commit | 2fe2d408a4e231eb5d2342b7f3dbd155563aa755 (patch) | |
| tree | 656713c8cbbe2c6c6d01ed79498fb1865bada71f /debugfs | |
| parent | 17abb05f515d72c78667108a95c904ef65bcc6aa (diff) | |
| download | android_external_e2fsprogs-2fe2d408a4e231eb5d2342b7f3dbd155563aa755.tar.gz android_external_e2fsprogs-2fe2d408a4e231eb5d2342b7f3dbd155563aa755.tar.bz2 android_external_e2fsprogs-2fe2d408a4e231eb5d2342b7f3dbd155563aa755.zip | |
mmp: fix 64-bit handling of s_mmp_block
Fix the checking of s_mmp_block in e2fsck_pass1() and
ext2fs_mmp_read() to handle the high 32 bits of s_blocks_count.
Remove redundant check of s_mmp_block in do_dump_mmp() right before
ext2fs_mmp_read() is called.
Also fix s_blocks_count_hi in check_backup_super_block(), since it
cannot use the ext2fs_blocks_count() helper easily.
Signed-off-by: Andreas Dilger <adilger@dilger.ca>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Diffstat (limited to 'debugfs')
| -rw-r--r-- | debugfs/debugfs.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/debugfs/debugfs.c b/debugfs/debugfs.c index 55902951..b2406c74 100644 --- a/debugfs/debugfs.c +++ b/debugfs/debugfs.c @@ -2312,11 +2312,6 @@ void do_dump_mmp(int argc EXT2FS_ATTR((unused)), char *argv[]) return; sb = current_fs->super; - if (sb->s_mmp_block <= sb->s_first_data_block || - sb->s_mmp_block >= ext2fs_blocks_count(sb)) { - com_err(argv[0], EXT2_ET_MMP_BAD_BLOCK, "while dumping it.\n"); - return; - } if (current_fs->mmp_buf == NULL) { retval = ext2fs_get_mem(current_fs->blocksize, |