From: Theodore Ts'o Date: Sun, 6 Jul 2014 04:09:27 +0000 (-0400) Subject: Merge branch 'maint' into next X-Git-Tag: v1.43-WIP-2015-05-18~278 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7f7d1cb462789eef8e359caa46523ed6b99255e1;p=thirdparty%2Fe2fsprogs.git Merge branch 'maint' into next Conflicts: debugfs/set_fields.c tests/f_mmp/script tests/f_mmp_garbage/script tests/m_mmp/script tests/t_mmp_1on/script tests/t_mmp_2off/script --- 7f7d1cb462789eef8e359caa46523ed6b99255e1 diff --cc configure index 53405aa6f,87fd2f3f5..dda21f173 --- a/configure +++ b/configure @@@ -853,12 -878,11 +878,14 @@@ enable_fsc enable_e2initrd_helper enable_tls enable_uuidd +enable_mmp +enable_bmap_stats +enable_bmap_stats_ops enable_nls + enable_threads with_gnu_ld enable_rpath + with_libpth_prefix with_libiconv_prefix with_included_gettext with_libintl_prefix @@@ -1513,10 -1538,10 +1541,13 @@@ Optional Features --enable-e2initrd-helper build e2initrd-helper program --disable-tls disable use of thread local support --disable-uuidd disable building the uuid daemon + --disable-mmp disable support mmp, Multi Mount Protection + --disable-bmap-stats disable collection of bitmap stats. + --enable-bmap-stats-ops enable collection of additional bitmap stats --disable-nls do not use Native Language Support + --enable-threads={posix|solaris|pth|windows} + specify multithreading API + --disable-threads build without multithread safety --disable-rpath do not hardcode runtime library paths Optional Packages: diff --cc debugfs/set_fields.c index 762e65582,d017eea8b..b4ca546aa --- a/debugfs/set_fields.c +++ b/debugfs/set_fields.c @@@ -153,7 -153,17 +153,18 @@@ static struct field_set_info super_fiel { "backup_bgs", &set_sb.s_backup_bgs[0], NULL, 4, parse_uint, FLAG_ARRAY, 2 }, { "checksum", &set_sb.s_checksum, NULL, 4, parse_uint }, + { "checksum_type", &set_sb.s_checksum_type, NULL, 1, parse_uint }, + { "error_count", &set_sb.s_error_count, NULL, 4, parse_uint }, + { "first_error_time", &set_sb.s_first_error_time, NULL, 4, parse_time }, + { "first_error_ino", &set_sb.s_first_error_ino, NULL, 4, parse_uint }, + { "first_error_block", &set_sb.s_first_error_block, NULL, 8, parse_uint }, + { "first_error_func", &set_sb.s_first_error_func, NULL, 32, parse_string }, + { "first_error_line", &set_sb.s_first_error_ino, NULL, 4, parse_uint }, + { "last_error_time", &set_sb.s_last_error_time, NULL, 4, parse_time }, + { "last_error_ino", &set_sb.s_last_error_ino, NULL, 4, parse_uint }, + { "last_error_block", &set_sb.s_last_error_block, NULL, 8, parse_uint }, + { "last_error_func", &set_sb.s_last_error_func, NULL, 32, parse_string }, + { "last_error_line", &set_sb.s_last_error_ino, NULL, 4, parse_uint }, { 0, 0, 0, 0 } }; diff --cc e2fsck/Makefile.in index db70abcb3,9a2f8f5c7..c40b188b5 --- a/e2fsck/Makefile.in +++ b/e2fsck/Makefile.in @@@ -40,18 -40,8 +40,9 @@@ COMPILE_ET=$(top_builddir)/lib/et/compi $(E) " CC $<" $(Q) $(CC) -c $(ALL_CFLAGS) $< -o $@ $(Q) $(CHECK_CMD) $(ALL_CFLAGS) $< + $(Q) $(CPPCHECK_CMD) $(CPPFLAGS) $< @PROFILE_CMT@ $(Q) $(CC) $(ALL_CFLAGS) -g -pg -o profiled/$*.o -c $< - # - # Flags for using Checker - # Note: The optimization flags must include -g - # - #MCHECK= -checker - #LIBS= $(LIBCOM_ERR) $(LIB_EXT2FS) $(CHECKLIB) - #DEPLIBS= $(LIBCOM_ERR) $(LIB_EXT2FS) - #CHECKLIB= /usr/lib/libchecker.o - # # Flags for doing mtrace --- uncomment to produce mtracing e2fsck # Note: The optimization flags must include -g diff --cc lib/blkid/Makefile.in index a27b20c14,6cabd36b6..e020a77eb --- a/lib/blkid/Makefile.in +++ b/lib/blkid/Makefile.in @@@ -56,9 -55,7 +55,8 @@@ DEPLIBS_BLKID= $(DEPSTATIC_LIBBLKID) $( $(E) " CC $<" $(Q) $(CC) $(ALL_CFLAGS) -c $< -o $@ $(Q) $(CHECK_CMD) $(ALL_CFLAGS) $< + $(Q) $(CPPCHECK_CMD) $(CPPFLAGS) $< @PROFILE_CMT@ $(Q) $(CC) $(ALL_CFLAGS) -g -pg -o profiled/$*.o -c $< - @CHECKER_CMT@ $(Q) $(CC) $(ALL_CFLAGS) -checker -g -o checker/$*.o -c $< @ELF_CMT@ $(Q) $(CC) $(ALL_CFLAGS) -fPIC -o elfshared/$*.o -c $< @BSDLIB_CMT@ $(Q) $(CC) $(ALL_CFLAGS) $(BSDLIB_PIC_FLAG) -o pic/$*.o -c $< diff --cc lib/e2p/Makefile.in index c8925cfd3,1c71c1cdd..728655240 --- a/lib/e2p/Makefile.in +++ b/lib/e2p/Makefile.in @@@ -56,9 -55,7 +55,8 @@@ BSDLIB_INSTALL_DIR = $(root_libdir $(E) " CC $<" $(Q) $(CC) $(ALL_CFLAGS) -c $< -o $@ $(Q) $(CHECK_CMD) $(ALL_CFLAGS) $< + $(Q) $(CPPCHECK_CMD) $(CPPFLAGS) $< @PROFILE_CMT@ $(Q) $(CC) $(ALL_CFLAGS) -g -pg -o profiled/$*.o -c $< - @CHECKER_CMT@ $(Q) $(CC) $(ALL_CFLAGS) -checker -g -o checker/$*.o -c $< @ELF_CMT@ $(Q) $(CC) $(ALL_CFLAGS) -fPIC -o elfshared/$*.o -c $< @BSDLIB_CMT@ $(Q) $(CC) $(ALL_CFLAGS) $(BSDLIB_PIC_FLAG) -o pic/$*.o -c $< diff --cc lib/et/Makefile.in index f9a79c071,68c3baf6d..dbf7c1aeb --- a/lib/et/Makefile.in +++ b/lib/et/Makefile.in @@@ -44,9 -44,7 +44,8 @@@ BSDLIB_INSTALL_DIR = $(root_libdir $(E) " CC $<" $(Q) $(CC) $(ALL_CFLAGS) -c $< -o $@ $(Q) $(CHECK_CMD) $(ALL_CFLAGS) $< + $(Q) $(CPPCHECK_CMD) $(CPPFLAGS) $< @PROFILE_CMT@ $(Q) $(CC) $(ALL_CFLAGS) -g -pg -o profiled/$*.o -c $< - @CHECKER_CMT@ $(Q) $(CC) $(ALL_CFLAGS) -checker -g -o checker/$*.o -c $< @ELF_CMT@ $(Q) $(CC) $(ALL_CFLAGS) -fPIC -o elfshared/$*.o -c $< @BSDLIB_CMT@ $(Q) $(CC) $(ALL_CFLAGS) $(BSDLIB_PIC_FLAG) -o pic/$*.o -c $< diff --cc lib/ext2fs/Makefile.in index ddf5942b4,6cc299d90..c39210710 --- a/lib/ext2fs/Makefile.in +++ b/lib/ext2fs/Makefile.in @@@ -233,9 -226,7 +232,8 @@@ all:: ext2fs.pc tst_libext2f $(E) " CC $<" $(Q) $(CC) $(ALL_CFLAGS) -c $< -o $@ $(Q) $(CHECK_CMD) $(ALL_CFLAGS) $< + $(Q) $(CPPCHECK_CMD) $(CPPFLAGS) $< @PROFILE_CMT@ $(Q) $(CC) $(ALL_CFLAGS) -g -pg -o profiled/$*.o -c $< - @CHECKER_CMT@ $(Q) $(CC) $(ALL_CFLAGS) -checker -g -o checker/$*.o -c $< @ELF_CMT@ $(Q) $(CC) $(ALL_CFLAGS) -fPIC -o elfshared/$*.o -c $< @BSDLIB_CMT@ $(Q) $(CC) $(ALL_CFLAGS) $(BSDLIB_PIC_FLAG) -o pic/$*.o -c $< diff --cc lib/quota/Makefile.in index 87fa08f88,4dd42ed10..7efe39c66 --- a/lib/quota/Makefile.in +++ b/lib/quota/Makefile.in @@@ -45,9 -44,7 +44,8 @@@ LIBDIR= quot $(E) " CC $<" $(Q) $(CC) $(ALL_CFLAGS) -c $< -o $@ $(Q) $(CHECK_CMD) $(ALL_CFLAGS) $< + $(Q) $(CPPCHECK_CMD) $(CPPFLAGS) $< @PROFILE_CMT@ $(Q) $(CC) $(ALL_CFLAGS) -g -pg -o profiled/$*.o -c $< - @CHECKER_CMT@ $(Q) $(CC) $(ALL_CFLAGS) -checker -g -o checker/$*.o -c $< #ELF_CMT# $(Q) $(CC) $(ALL_CFLAGS) -fPIC -o elfshared/$*.o -c $< #BSDLIB_CMT# $(Q) $(CC) $(ALL_CFLAGS) $(BSDLIB_PIC_FLAG) -o pic/$*.o -c $< diff --cc lib/ss/Makefile.in index 0647f6c16,24c5e372c..44edc0da9 --- a/lib/ss/Makefile.in +++ b/lib/ss/Makefile.in @@@ -35,9 -35,7 +35,8 @@@ MK_CMDS=_SS_DIR_OVERRIDE=. ./mk_cmd $(E) " CC $<" $(Q) $(CC) $(ALL_CFLAGS) -c $< $(Q) $(CHECK_CMD) $(ALL_CFLAGS) $< + $(Q) $(CPPCHECK_CMD) $(CPPFLAGS) $< @PROFILE_CMT@ $(Q) $(CC) $(ALL_CFLAGS) -g -pg -o profiled/$*.o -c $< - @CHECKER_CMT@ $(Q) $(CC) $(ALL_CFLAGS) -checker -g -o checker/$*.o -c $< @ELF_CMT@ $(Q) $(CC) $(ALL_CFLAGS) -DSHARED_ELF_LIB -fPIC -o elfshared/$*.o -c $< @BSDLIB_CMT@ $(Q) $(CC) $(ALL_CFLAGS) $(BSDLIB_PIC_FLAG) -o pic/$*.o -c $< diff --cc lib/uuid/Makefile.in index f22ab26b5,74ca478cd..f51714b16 --- a/lib/uuid/Makefile.in +++ b/lib/uuid/Makefile.in @@@ -63,9 -62,7 +62,8 @@@ BSDLIB_INSTALL_DIR = $(root_libdir $(E) " CC $<" $(Q) $(CC) $(ALL_CFLAGS) -c $< -o $@ $(Q) $(CHECK_CMD) $(ALL_CFLAGS) $< + $(Q) $(CPPCHECK_CMD) $(CPPFLAGS) $< @PROFILE_CMT@ $(Q) $(CC) $(ALL_CFLAGS) -g -pg -o profiled/$*.o -c $< - @CHECKER_CMT@ $(Q) $(CC) $(ALL_CFLAGS) -checker -g -o checker/$*.o -c $< @ELF_CMT@ $(Q) $(CC) $(ALL_CFLAGS) -fPIC -o elfshared/$*.o -c $< @BSDLIB_CMT@ $(Q) $(CC) $(ALL_CFLAGS) $(BSDLIB_PIC_FLAG) -o pic/$*.o -c $<