Merge branch 'maint' into next
diff --git a/MCONFIG.in b/MCONFIG.in
index ce0692e..7ca86ac 100644
--- a/MCONFIG.in
+++ b/MCONFIG.in
@@ -121,7 +121,7 @@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
-MKINSTALLDIRS = @MKINSTALLDIRS@
+MKDIR_P = @MKDIR_P@
#
# Library definitions
diff --git a/acinclude.m4 b/acinclude.m4
index 912383a..e9890f7 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -133,21 +133,3 @@
AC_SUBST(ifGNUmake)
AC_SUBST(ifNotGNUmake)
] )
-# was originally from nls.m4 serial 1 (gettext-0.12)
-AC_DEFUN([AM_MKINSTALLDIRS],
-[
- dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly
- dnl find the mkinstalldirs script in another subdir but $(top_srcdir).
- dnl Try to locate it.
- MKINSTALLDIRS=
- if test -n "$ac_aux_dir"; then
- case "$ac_aux_dir" in
- /*) MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" ;;
- *) MKINSTALLDIRS="\$(top_builddir)/$ac_aux_dir/mkinstalldirs" ;;
- esac
- fi
- if test -z "$MKINSTALLDIRS"; then
- MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
- fi
- AC_SUBST(MKINSTALLDIRS)
-])
diff --git a/configure b/configure
index f5092e3..6244cb9 100755
--- a/configure
+++ b/configure
@@ -640,7 +640,6 @@
CFLAGS_SHLIB
BUILD_LDFLAGS
BUILD_CFLAGS
-MKINSTALLDIRS
INCLUDES
DO_TEST_SUITE
LDFLAGS_STATIC
@@ -11640,6 +11639,7 @@
fi
+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5
$as_echo_n "checking whether ln -s works... " >&6; }
LN_S=$as_ln_s
@@ -14185,19 +14185,6 @@
INCLUDES="$INCLUDES -D_REENTRANT"
fi
-
- MKINSTALLDIRS=
- if test -n "$ac_aux_dir"; then
- case "$ac_aux_dir" in
- /*) MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" ;;
- *) MKINSTALLDIRS="\$(top_builddir)/$ac_aux_dir/mkinstalldirs" ;;
- esac
- fi
- if test -z "$MKINSTALLDIRS"; then
- MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
- fi
-
-
if test $cross_compiling = no; then
BUILD_CFLAGS="$CFLAGS $CPPFLAGS $INCLUDES -DHAVE_CONFIG_H"
BUILD_LDFLAGS="$LDFLAGS"
diff --git a/configure.ac b/configure.ac
index 54bd1fe..6c464ba 100644
--- a/configure.ac
+++ b/configure.ac
@@ -863,6 +863,7 @@
AC_PROG_MAKE_SET
CHECK_GNU_MAKE
AC_PATH_PROG(LN, ln, ln)
+AC_PROG_MKDIR_P
AC_PROG_LN_S
AC_PATH_PROG(MV, mv, mv)
AC_PATH_PROG(CP, cp, cp)
@@ -1579,7 +1580,6 @@
INCLUDES="$INCLUDES -D_REENTRANT"
fi
AC_SUBST(INCLUDES)
-AM_MKINSTALLDIRS
dnl
dnl Build CFLAGS
dnl
diff --git a/debugfs/Makefile.in b/debugfs/Makefile.in
index dede068..bb4d194 100644
--- a/debugfs/Makefile.in
+++ b/debugfs/Makefile.in
@@ -117,8 +117,8 @@
$(Q) $(SUBSTITUTE_UPTIME) $(srcdir)/debugfs.8.in debugfs.8
installdirs:
- $(E) " MKINSTALLDIRS $(root_sbindir) $(man8dir)"
- $(Q) $(MKINSTALLDIRS) $(DESTDIR)$(root_sbindir) \
+ $(E) " MKDIR_P $(root_sbindir) $(man8dir)"
+ $(Q) $(MKDIR_P) $(DESTDIR)$(root_sbindir) \
$(DESTDIR)$(man8dir)
install: $(PROGS) $(MANPAGES) installdirs
diff --git a/doc/Makefile.in b/doc/Makefile.in
index 0bee4e4..dab6094 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -21,8 +21,8 @@
install-doc-libs: libext2fs.info libext2fs.dvi
$(Q) $(RM) -rf $(DESTDIR)$(infodir)/libext2fs.info*
- $(E) " MKINSTALLDIRS $(infodir)"
- $(Q) $(MKINSTALLDIRS) $(DESTDIR)$(infodir)
+ $(E) " MKDIR_P $(infodir)"
+ $(Q) $(MKDIR_P) $(DESTDIR)$(infodir)
-$(Q) for i in libext2fs.info* ; do \
echo " INSTALL_DATA $(infodir)/$$i" ; \
$(INSTALL_DATA) $$i $(DESTDIR)$(infodir)/$$i ; \
diff --git a/e2fsck/Makefile.in b/e2fsck/Makefile.in
index 8fe05e0..676ab7d 100644
--- a/e2fsck/Makefile.in
+++ b/e2fsck/Makefile.in
@@ -187,8 +187,8 @@
$(Q) $(SUBSTITUTE_UPTIME) $(srcdir)/e2fsck.conf.5.in e2fsck.conf.5
installdirs:
- $(E) " MKINSTALLDIRS $(root_sbindir) $(man8dir)"
- $(Q) $(MKINSTALLDIRS) $(DESTDIR)$(root_sbindir) \
+ $(E) " MKDIR_P $(root_sbindir) $(man8dir)"
+ $(Q) $(MKDIR_P) $(DESTDIR)$(root_sbindir) \
$(DESTDIR)$(man8dir) $(DESTDIR)$(man5dir)
install: $(PROGS) $(MANPAGES) $(FMANPAGES) installdirs
diff --git a/e2fsck/problem.c b/e2fsck/problem.c
index 47321e0..0f60396 100644
--- a/e2fsck/problem.c
+++ b/e2fsck/problem.c
@@ -500,6 +500,12 @@
N_("@S would have too many inodes (%N).\n"),
PROMPT_NONE, PR_AFTER_CODE, PR_0_SB_CORRUPT },
+ /* Meta_bg and resize_inode are not compatible, disable resize_inode*/
+ { PR_0_DISABLE_RESIZE_INODE,
+ N_("Resize_@i and meta_bg features are enabled. Those features are\n"
+ "not compatible. Resize @i should be disabled. "),
+ PROMPT_FIX, 0 },
+
/* Pass 1 errors */
/* Pass 1: Checking inodes, blocks, and sizes */
diff --git a/e2fsck/problem.h b/e2fsck/problem.h
index 7db122a..2c79169 100644
--- a/e2fsck/problem.h
+++ b/e2fsck/problem.h
@@ -285,6 +285,9 @@
/* Inode count in the superblock incorrect */
#define PR_0_INODE_COUNT_BIG 0x000050
+/* Meta_bg and resize_inode are not compatible, remove resize_inode*/
+#define PR_0_DISABLE_RESIZE_INODE 0x000051
+
/*
* Pass 1 errors
*/
diff --git a/e2fsck/super.c b/e2fsck/super.c
index eb7ab0d..e5932be 100644
--- a/e2fsck/super.c
+++ b/e2fsck/super.c
@@ -436,6 +436,14 @@
clear_problem_context(&pctx);
+ if (ext2fs_has_feature_resize_inode(fs->super) &&
+ ext2fs_has_feature_meta_bg(fs->super) &&
+ fix_problem(ctx, PR_0_DISABLE_RESIZE_INODE, &pctx)) {
+ ext2fs_clear_feature_resize_inode(fs->super);
+ fs->super->s_reserved_gdt_blocks = 0;
+ ext2fs_mark_super_dirty(fs);
+ }
+
/*
* If the resize inode feature isn't set, then
* s_reserved_gdt_blocks must be zero.
diff --git a/e2fsck/unix.c b/e2fsck/unix.c
index 90065b3..2df22b1 100644
--- a/e2fsck/unix.c
+++ b/e2fsck/unix.c
@@ -617,9 +617,10 @@
fprintf(stderr, _("ERROR: Couldn't open "
"/dev/null (%s)\n"),
strerror(errno));
- break;
+ return;
}
}
+ (void) close(fd);
}
#ifdef HAVE_SIGNAL_H
diff --git a/intl/Makefile.in b/intl/Makefile.in
index 70d7834..e037e23 100644
--- a/intl/Makefile.in
+++ b/intl/Makefile.in
@@ -40,8 +40,8 @@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
-MKINSTALLDIRS = @MKINSTALLDIRS@
-mkinstalldirs = $(SHELL) $(MKINSTALLDIRS)
+MKDIR_P = @MKDIR_P@
+mkinstalldirs = $(SHELL) $(MKDIR_P)
@SET_MAKE@
diff --git a/lib/Makefile.elf-lib b/lib/Makefile.elf-lib
index 4e88c05..bd7b2b3 100644
--- a/lib/Makefile.elf-lib
+++ b/lib/Makefile.elf-lib
@@ -35,8 +35,8 @@
$(Q) (cd ..; $(LN) $(LINK_BUILD_FLAGS) $(ELF_LIB) $(ELF_SONAME))
installdirs-elf-lib::
- $(E) " MKINSTALLDIRS $(ELF_INSTALL_DIR) $(libdir)"
- $(Q) $(MKINSTALLDIRS) $(DESTDIR)$(ELF_INSTALL_DIR) \
+ $(E) " MKDIR_P $(ELF_INSTALL_DIR) $(libdir)"
+ $(Q) $(MKDIR_P) $(DESTDIR)$(ELF_INSTALL_DIR) \
$(DESTDIR)$(libdir)
installdirs:: installdirs-elf-lib
diff --git a/lib/Makefile.solaris-lib b/lib/Makefile.solaris-lib
index a3d395e..304df7d 100644
--- a/lib/Makefile.solaris-lib
+++ b/lib/Makefile.solaris-lib
@@ -35,7 +35,7 @@
$(Q) (cd ..; $(LN) $(LINK_BUILD_FLAGS) $(ELF_LIB) $(ELF_SONAME))
installdirs-elf-lib::
- $(MKINSTALLDIRS) $(DESTDIR)$(ELF_INSTALL_DIR) \
+ $(MKDIR_P) $(DESTDIR)$(ELF_INSTALL_DIR) \
$(DESTDIR)$(libdir)
installdirs:: installdirs-elf-lib
diff --git a/lib/blkid/Makefile.in b/lib/blkid/Makefile.in
index 0be2da5..850d688 100644
--- a/lib/blkid/Makefile.in
+++ b/lib/blkid/Makefile.in
@@ -146,8 +146,8 @@
$(Q) cd $(top_builddir); CONFIG_FILES=lib/blkid/blkid.pc ./config.status
installdirs::
- $(E) " MKINSTALLDIRS $(libdir) $(includedir)/blkid"
- $(Q) $(MKINSTALLDIRS) $(DESTDIR)$(libdir) \
+ $(E) " MKDIR_P $(libdir) $(includedir)/blkid"
+ $(Q) $(MKDIR_P) $(DESTDIR)$(libdir) \
$(DESTDIR)$(includedir)/blkid $(DESTDIR)$(pkgconfigdir)
install:: all installdirs
diff --git a/lib/blkid/getsize.c b/lib/blkid/getsize.c
index 4e2835f..75f21d5 100644
--- a/lib/blkid/getsize.c
+++ b/lib/blkid/getsize.c
@@ -78,12 +78,15 @@
unsigned long long size64;
blkid_loff_t high, low;
-#ifdef DKIOCGETBLOCKCOUNT /* For Apple Darwin */
- if (ioctl(fd, DKIOCGETBLOCKCOUNT, &size64) >= 0) {
+#if defined DKIOCGETBLOCKCOUNT && defined DKIOCGETBLOCKSIZE /* For Apple Darwin */
+ unsigned int size;
+
+ if (ioctl(fd, DKIOCGETBLOCKCOUNT, &size64) >= 0 &&
+ ioctl(fd, DKIOCGETBLOCKSIZE, &size) >= 0) {
if (sizeof(blkid_loff_t) < sizeof(unsigned long long) &&
- (size64 << 9) > 0xFFFFFFFF)
+ (size64 * size) > 0xFFFFFFFF)
return 0; /* EFBIG */
- return (blkid_loff_t)size64 << 9;
+ return (blkid_loff_t)size64 * size;
}
#endif
diff --git a/lib/e2p/Makefile.in b/lib/e2p/Makefile.in
index 534d229..2b0aa19 100644
--- a/lib/e2p/Makefile.in
+++ b/lib/e2p/Makefile.in
@@ -80,8 +80,8 @@
./tst_feature
installdirs::
- $(E) " MKINSTALLDIRS $(libdir) $(includedir)/e2p"
- $(Q) $(MKINSTALLDIRS) $(DESTDIR)$(libdir) \
+ $(E) " MKDIR_P $(libdir) $(includedir)/e2p"
+ $(Q) $(MKDIR_P) $(DESTDIR)$(libdir) \
$(DESTDIR)$(includedir)/e2p $(DESTDIR)$(pkgconfigdir)
install:: all installdirs
diff --git a/lib/e2p/feature.c b/lib/e2p/feature.c
index 0fab9c7..e3b0dab 100644
--- a/lib/e2p/feature.c
+++ b/lib/e2p/feature.c
@@ -74,6 +74,8 @@
"project"},
{ E2P_FEATURE_RO_INCOMPAT, EXT4_FEATURE_RO_COMPAT_SHARED_BLOCKS,
"shared_blocks"},
+ { E2P_FEATURE_RO_INCOMPAT, EXT4_FEATURE_RO_COMPAT_VERITY,
+ "verity"},
{ E2P_FEATURE_INCOMPAT, EXT2_FEATURE_INCOMPAT_COMPRESSION,
"compression" },
diff --git a/lib/e2p/pf.c b/lib/e2p/pf.c
index f93f22f..1c4bdde 100644
--- a/lib/e2p/pf.c
+++ b/lib/e2p/pf.c
@@ -46,6 +46,7 @@
{ FS_NOCOW_FL, "C", "No_COW" },
{ EXT4_INLINE_DATA_FL, "N", "Inline_Data" },
{ EXT4_PROJINHERIT_FL, "P", "Project_Hierarchy" },
+ { EXT4_PROJINHERIT_FL, "V", "Verity" },
{ 0, NULL, NULL }
};
diff --git a/lib/et/Makefile.in b/lib/et/Makefile.in
index 0344679..16e29ea 100644
--- a/lib/et/Makefile.in
+++ b/lib/et/Makefile.in
@@ -100,8 +100,8 @@
$(TAGS) $(SRCS)
installdirs::
- $(E) " MKINSTALLDIRS $(libdir) $(includedir)/et $(datadir)/et $(bindir) $(man1dir) $(man3dir)"
- $(Q) $(MKINSTALLDIRS) $(DESTDIR)$(libdir) \
+ $(E) " MKDIR_P $(libdir) $(includedir)/et $(datadir)/et $(bindir) $(man1dir) $(man3dir)"
+ $(Q) $(MKDIR_P) $(DESTDIR)$(libdir) \
$(DESTDIR)$(includedir)/et $(DESTDIR)$(datadir)/et \
$(DESTDIR)$(bindir) $(DESTDIR)$(man1dir) \
$(DESTDIR)$(man3dir) $(DESTDIR)$(pkgconfigdir)
diff --git a/lib/et/compile_et.sh.in b/lib/et/compile_et.sh.in
index 4c4ba17..3cba7c7 100644
--- a/lib/et/compile_et.sh.in
+++ b/lib/et/compile_et.sh.in
@@ -2,7 +2,6 @@
#
#
-datarootdir=@datarootdir@
AWK=@AWK@
DIR=@datadir@/et
diff --git a/lib/ext2fs/Makefile.in b/lib/ext2fs/Makefile.in
index 99302ca..4a197cd 100644
--- a/lib/ext2fs/Makefile.in
+++ b/lib/ext2fs/Makefile.in
@@ -553,8 +553,8 @@
$(TESTENV) ./tst_digest_encode
installdirs::
- $(E) " MKINSTALLDIRS $(libdir) $(includedir)/ext2fs"
- $(Q) $(MKINSTALLDIRS) $(DESTDIR)$(libdir) \
+ $(E) " MKDIR_P $(libdir) $(includedir)/ext2fs"
+ $(Q) $(MKDIR_P) $(DESTDIR)$(libdir) \
$(DESTDIR)$(includedir)/ext2fs $(DESTDIR)$(pkgconfigdir)
install:: all $(HFILES) $(HFILES_IN) installdirs ext2fs.pc
diff --git a/lib/ext2fs/ext2_fs.h b/lib/ext2fs/ext2_fs.h
index 9fd59e3..4ad09f1 100644
--- a/lib/ext2fs/ext2_fs.h
+++ b/lib/ext2fs/ext2_fs.h
@@ -321,6 +321,7 @@
#define EXT2_TOPDIR_FL 0x00020000 /* Top of directory hierarchies*/
#define EXT4_HUGE_FILE_FL 0x00040000 /* Set to each huge file */
#define EXT4_EXTENTS_FL 0x00080000 /* Inode uses extents */
+#define EXT4_VERITY_FL 0x00100000 /* Verity protected inode */
#define EXT4_EA_INODE_FL 0x00200000 /* Inode used for large EA */
/* EXT4_EOFBLOCKS_FL 0x00400000 was here */
#define FS_NOCOW_FL 0x00800000 /* Do not cow file */
@@ -812,7 +813,7 @@
#define EXT4_FEATURE_RO_COMPAT_READONLY 0x1000
#define EXT4_FEATURE_RO_COMPAT_PROJECT 0x2000 /* Project quota */
#define EXT4_FEATURE_RO_COMPAT_SHARED_BLOCKS 0x4000
-
+#define EXT4_FEATURE_RO_COMPAT_VERITY 0x8000
#define EXT2_FEATURE_INCOMPAT_COMPRESSION 0x0001
#define EXT2_FEATURE_INCOMPAT_FILETYPE 0x0002
@@ -905,6 +906,7 @@
EXT4_FEATURE_RO_COMPAT_FUNCS(readonly, 4, READONLY)
EXT4_FEATURE_RO_COMPAT_FUNCS(project, 4, PROJECT)
EXT4_FEATURE_RO_COMPAT_FUNCS(shared_blocks, 4, SHARED_BLOCKS)
+EXT4_FEATURE_RO_COMPAT_FUNCS(verity, 4, VERITY)
EXT4_FEATURE_INCOMPAT_FUNCS(compression, 2, COMPRESSION)
EXT4_FEATURE_INCOMPAT_FUNCS(filetype, 2, FILETYPE)
@@ -930,7 +932,8 @@
#define EXT2_FEATURE_RO_COMPAT_SUPP (EXT2_FEATURE_RO_COMPAT_SPARSE_SUPER| \
EXT2_FEATURE_RO_COMPAT_LARGE_FILE| \
EXT4_FEATURE_RO_COMPAT_DIR_NLINK| \
- EXT2_FEATURE_RO_COMPAT_BTREE_DIR)
+ EXT2_FEATURE_RO_COMPAT_BTREE_DIR| \
+ EXT4_FEATURE_RO_COMPAT_VERITY)
/*
* Default values for user and/or group using reserved blocks
diff --git a/lib/ext2fs/getsize.c b/lib/ext2fs/getsize.c
index f3839ba..be06775 100644
--- a/lib/ext2fs/getsize.c
+++ b/lib/ext2fs/getsize.c
@@ -151,9 +151,12 @@
if (fd < 0)
return errno;
-#ifdef DKIOCGETBLOCKCOUNT /* For Apple Darwin */
- if (ioctl(fd, DKIOCGETBLOCKCOUNT, &size64) >= 0) {
- *retblocks = size64 / (blocksize / 512);
+#if defined DKIOCGETBLOCKCOUNT && defined DKIOCGETBLOCKSIZE /* For Apple Darwin */
+ unsigned int size;
+
+ if (ioctl(fd, DKIOCGETBLOCKCOUNT, &size64) >= 0 &&
+ ioctl(fd, DKIOCGETBLOCKSIZE, &size) >= 0) {
+ *retblocks = size64 * size / blocksize;
goto out;
}
#endif
diff --git a/lib/ss/Makefile.in b/lib/ss/Makefile.in
index ee18dc8..bf2989b 100644
--- a/lib/ss/Makefile.in
+++ b/lib/ss/Makefile.in
@@ -124,8 +124,8 @@
$(Q) cd $(top_builddir); CONFIG_FILES=lib/ss/ss.pc ./config.status
installdirs::
- $(E) " MKINSTALLDIRS $(libdir) $(includedir)/ss $(datadir)/ss $(bindir)"
- $(Q) $(MKINSTALLDIRS) $(DESTDIR)$(libdir) \
+ $(E) " MKDIR_P $(libdir) $(includedir)/ss $(datadir)/ss $(bindir)"
+ $(Q) $(MKDIR_P) $(DESTDIR)$(libdir) \
$(DESTDIR)$(includedir)/ss $(DESTDIR)$(datadir)/ss \
$(DESTDIR)$(bindir) $(DESTDIR)$(pkgconfigdir)
diff --git a/lib/ss/mk_cmds.sh.in b/lib/ss/mk_cmds.sh.in
index 0abc19d..6d48735 100644
--- a/lib/ss/mk_cmds.sh.in
+++ b/lib/ss/mk_cmds.sh.in
@@ -2,7 +2,6 @@
#
#
-datarootdir=@datarootdir@
DIR=@datadir@/ss
AWK=@AWK@
SED=@SED@
diff --git a/lib/uuid/Makefile.in b/lib/uuid/Makefile.in
index 4b44418..972459f 100644
--- a/lib/uuid/Makefile.in
+++ b/lib/uuid/Makefile.in
@@ -130,8 +130,8 @@
$(Q) cd $(top_builddir); CONFIG_FILES=lib/uuid/uuid.pc ./config.status
installdirs::
- $(E) " MKINSTALLDIRS $(libdir) $(includedir)/uuid $(man3dir)"
- $(Q) $(MKINSTALLDIRS) $(DESTDIR)$(libdir) \
+ $(E) " MKDIR_P $(libdir) $(includedir)/uuid $(man3dir)"
+ $(Q) $(MKDIR_P) $(DESTDIR)$(libdir) \
$(DESTDIR)$(includedir)/uuid $(DESTDIR)$(man3dir) \
$(DESTDIR)$(pkgconfigdir)
diff --git a/misc/Makefile.in b/misc/Makefile.in
index 9902841..22c9848 100644
--- a/misc/Makefile.in
+++ b/misc/Makefile.in
@@ -529,8 +529,8 @@
$(Q) $(SUBSTITUTE_UPTIME) $(srcdir)/filefrag.8.in filefrag.8
installdirs:
- $(E) " MKINSTALLDIRS $(sbindir) $(root_sbindir) $(bindir) $(man1dir) $(man8dir) $(libdir) $(root_sysconfdir)"
- $(Q) $(MKINSTALLDIRS) $(DESTDIR)$(sbindir) \
+ $(E) " MKDIR_P $(sbindir) $(root_sbindir) $(bindir) $(man1dir) $(man8dir) $(libdir) $(root_sysconfdir)"
+ $(Q) $(MKDIR_P) $(DESTDIR)$(sbindir) \
$(DESTDIR)$(root_sbindir) $(DESTDIR)$(bindir) \
$(DESTDIR)$(man1dir) $(DESTDIR)$(man8dir) \
$(DESTDIR)$(man1dir) $(DESTDIR)$(man5dir) \
diff --git a/misc/mke2fs.c b/misc/mke2fs.c
index b23ea76..f05003f 100644
--- a/misc/mke2fs.c
+++ b/misc/mke2fs.c
@@ -1124,7 +1124,8 @@
EXT4_FEATURE_RO_COMPAT_BIGALLOC|
EXT4_FEATURE_RO_COMPAT_QUOTA|
EXT4_FEATURE_RO_COMPAT_METADATA_CSUM|
- EXT4_FEATURE_RO_COMPAT_PROJECT
+ EXT4_FEATURE_RO_COMPAT_PROJECT|
+ EXT4_FEATURE_RO_COMPAT_VERITY
};
diff --git a/misc/tune2fs.c b/misc/tune2fs.c
index 4b673bc..0f095f4 100644
--- a/misc/tune2fs.c
+++ b/misc/tune2fs.c
@@ -170,7 +170,8 @@
EXT4_FEATURE_RO_COMPAT_QUOTA |
EXT4_FEATURE_RO_COMPAT_METADATA_CSUM |
EXT4_FEATURE_RO_COMPAT_READONLY |
- EXT4_FEATURE_RO_COMPAT_PROJECT
+ EXT4_FEATURE_RO_COMPAT_PROJECT |
+ EXT4_FEATURE_RO_COMPAT_VERITY
};
static __u32 clear_ok_features[3] = {
diff --git a/po/Makefile.in.in b/po/Makefile.in.in
index eff37d3..67e1f2f 100644
--- a/po/Makefile.in.in
+++ b/po/Makefile.in.in
@@ -29,8 +29,7 @@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
-MKINSTALLDIRS = @MKINSTALLDIRS@
-mkinstalldirs = $(SHELL) $(MKINSTALLDIRS)
+mkinstalldirs = @MKDIR_P@
GMSGFMT = @GMSGFMT@
MSGFMT = @MSGFMT@
diff --git a/resize/Makefile.in b/resize/Makefile.in
index 8090333..f7f836a 100644
--- a/resize/Makefile.in
+++ b/resize/Makefile.in
@@ -60,8 +60,8 @@
$(Q) $(CC) $(ALL_LDFLAGS) -o test_extent $(TEST_EXTENT_OBJS) $(LIBS)
installdirs:
- $(E) " MKINSTALLDIRS $(root_sbindir) $(man8dir)"
- $(Q) $(MKINSTALLDIRS) $(DESTDIR)$(root_sbindir) \
+ $(E) " MKDIR_P $(root_sbindir) $(man8dir)"
+ $(Q) $(MKDIR_P) $(DESTDIR)$(root_sbindir) \
$(DESTDIR)$(man8dir)
install: $(PROGS) $(MANPAGES) installdirs
