diff options
| author | Jaegeuk Kim <jaegeuk@google.com> | 2018-01-10 19:33:47 -0800 |
|---|---|---|
| committer | Jaegeuk Kim <jaegeuk@google.com> | 2018-04-06 10:18:12 -0700 |
| commit | 7a2c1cd470d52ce51c9f7bdbc4b6ccf59126f585 (patch) | |
| tree | e18c2774a547548a2dfd6bef3adf9c63bb4b34b4 | |
| parent | a28082b41a9b505ad4c229e7c55ae710c8cf5fc9 (diff) | |
| download | f2fs-tools-7a2c1cd470d52ce51c9f7bdbc4b6ccf59126f585.tar.gz | |
mkfs.f2fs: support fsverity featureandroid-p-preview-2p-preview-2
This is aligned to f2fs which reserves fsverity feature bit.
Bug: 74604441
Bug: 67380979
Change-Id: I202b825a03d54dbe8c224e6bc9344f53eea6d671
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
| -rw-r--r-- | fsck/mount.c | 3 | ||||
| -rw-r--r-- | include/f2fs_fs.h | 12 | ||||
| -rw-r--r-- | mkfs/f2fs_format_main.c | 2 |
3 files changed, 13 insertions, 4 deletions
diff --git a/fsck/mount.c b/fsck/mount.c index 4211e5f..5d234ec 100644 --- a/fsck/mount.c +++ b/fsck/mount.c @@ -439,6 +439,9 @@ void print_sb_state(struct f2fs_super_block *sb) if (f & cpu_to_le32(F2FS_FEATURE_ENCRYPT)) { MSG(0, "%s", " encrypt"); } + if (f & cpu_to_le32(F2FS_FEATURE_VERITY)) { + MSG(0, "%s", " verity"); + } if (f & cpu_to_le32(F2FS_FEATURE_BLKZONED)) { MSG(0, "%s", " blkzoned"); } diff --git a/include/f2fs_fs.h b/include/f2fs_fs.h index 64d3046..8ed9db1 100644 --- a/include/f2fs_fs.h +++ b/include/f2fs_fs.h @@ -552,6 +552,7 @@ enum { #define F2FS_FEATURE_FLEXIBLE_INLINE_XATTR 0x0040 #define F2FS_FEATURE_QUOTA_INO 0x0080 #define F2FS_FEATURE_INODE_CRTIME 0x0100 +#define F2FS_FEATURE_VERITY 0x0400 /* reserved */ #define MAX_VOLUME_NAME 512 @@ -730,10 +731,13 @@ struct f2fs_extent { /* * i_advise uses FADVISE_XXX_BIT. We can add additional hints later. */ -#define FADVISE_COLD_BIT 0x01 -#define FADVISE_LOST_PINO_BIT 0x02 -#define FADVISE_ENCRYPT_BIT 0x04 -#define FADVISE_ENC_NAME_BIT 0x08 +#define FADVISE_COLD_BIT 0x01 +#define FADVISE_LOST_PINO_BIT 0x02 +#define FADVISE_ENCRYPT_BIT 0x04 +#define FADVISE_ENC_NAME_BIT 0x08 +#define FADVISE_KEEP_SIZE_BIT 0x10 +#define FADVISE_HOT_BIT 0x20 +#define FADVISE_VERITY_BIT 0x40 /* reserved */ #define file_is_encrypt(fi) ((fi)->i_advise & FADVISE_ENCRYPT_BIT) #define file_enc_name(fi) ((fi)->i_advise & FADVISE_ENC_NAME_BIT) diff --git a/mkfs/f2fs_format_main.c b/mkfs/f2fs_format_main.c index 19f0854..36228d5 100644 --- a/mkfs/f2fs_format_main.c +++ b/mkfs/f2fs_format_main.c @@ -83,6 +83,8 @@ static void parse_feature(const char *features) features++; if (!strcmp(features, "encrypt")) { c.feature |= cpu_to_le32(F2FS_FEATURE_ENCRYPT); + } else if (!strcmp(features, "verity")) { + c.feature |= cpu_to_le32(F2FS_FEATURE_VERITY); } else if (!strcmp(features, "extra_attr")) { c.feature |= cpu_to_le32(F2FS_FEATURE_EXTRA_ATTR); } else if (!strcmp(features, "project_quota")) { |