Whamcloud - gitweb
git://git.whamcloud.com
/
tools
/
e2fsprogs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'maint' into next
[tools/e2fsprogs.git]
/
debugfs
/
debugfs.c
diff --git
a/debugfs/debugfs.c
b/debugfs/debugfs.c
index
b67a88b
..
9b6321d
100644
(file)
--- a/
debugfs/debugfs.c
+++ b/
debugfs/debugfs.c
@@
-50,7
+50,7
@@
int journal_enable_debug = -1;
/*
* There must be only one definition if we're hooking in extra commands or
/*
* There must be only one definition if we're hooking in extra commands or
- * chaging default prompt. Use -DSKIP_GLOBDEF for that.
+ * cha
n
ging default prompt. Use -DSKIP_GLOBDEF for that.
*/
#ifndef SKIP_GLOBDEFS
ss_request_table *extra_cmds;
*/
#ifndef SKIP_GLOBDEFS
ss_request_table *extra_cmds;
@@
-195,9
+195,7
@@
try_open_again:
}
current_fs->default_bitmap_type = EXT2FS_BMAP64_RBTREE;
}
current_fs->default_bitmap_type = EXT2FS_BMAP64_RBTREE;
- if (catastrophic)
- com_err(device, 0, "catastrophic mode - not reading inode or group bitmaps");
- else {
+ if (!catastrophic) {
retval = ext2fs_read_bitmaps(current_fs);
if (retval) {
com_err(device, retval,
retval = ext2fs_read_bitmaps(current_fs);
if (retval) {
com_err(device, retval,