korg/e2fsprogs
0
0
Fork 0
mirror of https://git.kernel.org/pub/scm/fs/ext2/e2fsprogs.git synced 2024-11-27 12:04:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

tune2fs: don't include journal recovery when building for Android

Browse Source 
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
This commit is contained in:
Theodore Ts'o 2016-03-18 16:07:34 -04:00
parent f5b69d4ad1
commit 9c05bb9fba
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
misc/Android.mk
View File

@ -57,7 +57,7 @@ tune2fs_src_files := \
tune2fs_c_includes := \
external/e2fsprogs/e2fsck
tune2fs_cflags := -O2 -g -W -Wall
tune2fs_cflags := -O2 -g -W -Wall -DNO_RECOVERY
tune2fs_shared_libraries := \
libext2fs \

13
misc/tune2fs.c
View File

@ -3154,6 +3154,18 @@ retry_open:
free(ext_mount_opts);
}
#ifdef NO_RECOVERY
/* Warn if file system needs recovery and it is opened for writing. */
if ((open_flag & EXT2_FLAG_RW) && !(mount_flags & EXT2_MF_MOUNTED) &&
(sb->s_feature_compat & EXT3_FEATURE_COMPAT_HAS_JOURNAL) &&
(sb->s_feature_incompat & EXT3_FEATURE_INCOMPAT_RECOVER)) {
fprintf(stderr,
_("Warning: The journal is dirty. You may wish to replay the journal like:\n\n"
"\te2fsck -E journal_only %s\n\n"
"then rerun this command. Otherwise, any changes made may be overwritten\n"
"by journal recovery.\n"), device_name);
}
#else
/* Recover the journal if possible. */
if ((open_flag & EXT2_FLAG_RW) && !(mount_flags & EXT2_MF_MOUNTED) &&
ext2fs_has_feature_journal_needs_recovery(fs->super)) {
@ -3169,6 +3181,7 @@ retry_open:
ext2fs_clear_feature_journal_needs_recovery(fs->super);
ext2fs_mark_super_dirty(fs);
}
#endif
free(device_name);
remove_error_table(&et_ext2_error_table);