diff options
| author | Eric Biggers <ebiggers@google.com> | 2018-04-18 12:14:58 -0700 |
|---|---|---|
| committer | Eric Biggers <ebiggers@google.com> | 2018-04-18 12:14:58 -0700 |
| commit | 3ffee6b898a75a7a041a3cbf43154004aa0fb17b (patch) | |
| tree | 092dd4aa456093a60a668920f1b5777b95cbb217 | |
| parent | af15963d38978e47562e410257533119807dbc80 (diff) | |
| download | fsverity-utils-3ffee6b898a75a7a041a3cbf43154004aa0fb17b.tar.gz | |
Remove obsolete f2fs-tools patch
Signed-off-by: Eric Biggers <ebiggers@google.com>
| -rw-r--r-- | f2fs-verity-bit.diff | 41 |
1 files changed, 0 insertions, 41 deletions
diff --git a/f2fs-verity-bit.diff b/f2fs-verity-bit.diff deleted file mode 100644 index cb7e87a..0000000 --- a/f2fs-verity-bit.diff +++ /dev/null @@ -1,41 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index 73c830d..7733af4 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -52,8 +52,6 @@ AC_PATH_PROG([LDCONFIG], [ldconfig], - [$PATH:/sbin]) - - # Checks for libraries. --PKG_CHECK_MODULES([libuuid], [uuid]) -- - AS_IF([test "x$with_selinux" != "xno"], - [PKG_CHECK_MODULES([libselinux], [libselinux], - [have_selinux=yes], [have_selinux=no])], -diff --git a/include/f2fs_fs.h b/include/f2fs_fs.h -index 782c936..7184419 100644 ---- a/include/f2fs_fs.h -+++ b/include/f2fs_fs.h -@@ -550,6 +550,7 @@ enum { - #define F2FS_FEATURE_INODE_CHKSUM 0x0020 - #define F2FS_FEATURE_FLEXIBLE_INLINE_XATTR 0x0040 - #define F2FS_FEATURE_QUOTA_INO 0x0080 -+#define F2FS_FEATURE_VERITY 0x0200 - - #define MAX_VOLUME_NAME 512 - -diff --git a/mkfs/f2fs_format_main.c b/mkfs/f2fs_format_main.c -index e41bcb1..15de5fe 100644 ---- a/mkfs/f2fs_format_main.c -+++ b/mkfs/f2fs_format_main.c -@@ -80,7 +80,10 @@ static void parse_feature(const char *features) - { - while (*features == ' ') - features++; -- if (!strcmp(features, "encrypt")) { -+ if (!strcmp(features, "verity")) { -+ MSG(0, "Info: Setting verity\n"); -+ c.feature |= cpu_to_le32(F2FS_FEATURE_VERITY); -+ } else if (!strcmp(features, "encrypt")) { - c.feature |= cpu_to_le32(F2FS_FEATURE_ENCRYPT); - } else if (!strcmp(features, "extra_attr")) { - c.feature |= cpu_to_le32(F2FS_FEATURE_EXTRA_ATTR); |