Support the stable_inodes feature
Eric Biggers
maintainerPATCH 1/1 Support the stable_inodes feature
From: Eric Biggers <[email protected]>
Reserve the codepoint for EXT4_FEATURE_COMPAT_STABLE_INODES, allow it to be set and cleared, and teach resize2fs to forbid shrinking the filesystem if it is set.
This feature will allow the use of encryption policies where the inode number is included in the IVs (initialization vectors) for encryption, so data would be corrupted if the inodes were to be renumbered.
For more details, see the kernel patchset:
https://lkml.kernel.org/linux-fsdevel/[email protected]/T/#u
--- lib/e2p/feature.c | 2 ++ lib/ext2fs/ext2_fs.h | 2 ++ lib/ext2fs/ext2fs.h | 3 ++- misc/mke2fs.c | 3 ++- misc/tune2fs.c | 6 ++++-- resize/main.c | 6 ++++++ 6 files changed, 18 insertions(+), 4 deletions(-)
lib/e2p/feature.c +2 -0
@@ -47,6 +47,8 @@ static struct feature feature_list[] = { "sparse_super2" }, {E2P_FEATURE_COMPAT ,EXT4_FEATURE_COMPAT_FAST_COMMIT , "fast_commit" }, + { E2P_FEATURE_COMPAT, EXT4_FEATURE_COMPAT_STABLE_INODES, + "stable_inodes" }, { E2P_FEATURE_RO_INCOMPAT, EXT2_FEATURE_RO_COMPAT_SPARSE_SUPER, "sparse_super" },
lib/ext2fs/ext2_fs.h +2 -0
@@ -811,6 +811,7 @@ struct ext2_super_block {#define EXT2_FEATURE_COMPAT_EXCLUDE_BITMAP 0x0100#define EXT4_FEATURE_COMPAT_SPARSE_SUPER2 0x0200#define EXT4_FEATURE_COMPAT_FAST_COMMIT 0x0400 +#define EXT4_FEATURE_COMPAT_STABLE_INODES 0x0800#define EXT2_FEATURE_RO_COMPAT_SPARSE_SUPER 0x0001
@@ -913,6 +914,7 @@ EXT4_FEATURE_COMPAT_FUNCS(lazy_bg, 2, LAZY_BG) EXT4_FEATURE_COMPAT_FUNCS(exclude_bitmap, 2, EXCLUDE_BITMAP) EXT4_FEATURE_COMPAT_FUNCS(sparse_super2, 4, SPARSE_SUPER2) EXT4_FEATURE_COMPAT_FUNCS(fast_commit, 4, FAST_COMMIT) +EXT4_FEATURE_COMPAT_FUNCS(stable_inodes, 4, STABLE_INODES) EXT4_FEATURE_RO_COMPAT_FUNCS(sparse_super, 2, SPARSE_SUPER)EXT4_FEATURE_RO_COMPAT_FUNCS (large_file,2 ,LARGE_FILE )
lib/ext2fs/ext2fs.h +2 -1
@@ -612,7 +612,8 @@ typedef struct ext2_icount *ext2_icount_t; EXT2_FEATURE_COMPAT_DIR_INDEX|\ EXT2_FEATURE_COMPAT_EXT_ATTR|\ EXT4_FEATURE_COMPAT_SPARSE_SUPER2|\ - EXT4_FEATURE_COMPAT_FAST_COMMIT) + EXT4_FEATURE_COMPAT_FAST_COMMIT|\ + EXT4_FEATURE_COMPAT_STABLE_INODES)#ifdef CONFIG_MMP #define EXT4_LIB_INCOMPAT_MMP EXT4_FEATURE_INCOMPAT_MMP
misc/mke2fs.c +2 -1
@@ -1144,7 +1144,8 @@ static __u32 ok_features[3] = {EXT2_FEATURE_COMPAT_DIR_INDEX |EXT2_FEATURE_COMPAT_EXT_ATTR |EXT4_FEATURE_COMPAT_SPARSE_SUPER2 | -EXT4_FEATURE_COMPAT_FAST_COMMIT , +EXT4_FEATURE_COMPAT_FAST_COMMIT | +EXT4_FEATURE_COMPAT_STABLE_INODES ,/* Incompat */ EXT2_FEATURE_INCOMPAT_FILETYPE | EXT3_FEATURE_INCOMPAT_EXTENTS|
misc/tune2fs.c +4 -2
@@ -150,7 +150,8 @@ static __u32 ok_features[3] = {/* Compat */ EXT3_FEATURE_COMPAT_HAS_JOURNAL |EXT2_FEATURE_COMPAT_DIR_INDEX | -EXT4_FEATURE_COMPAT_FAST_COMMIT , +EXT4_FEATURE_COMPAT_FAST_COMMIT | +EXT4_FEATURE_COMPAT_STABLE_INODES ,/* Incompat */ EXT2_FEATURE_INCOMPAT_FILETYPE | EXT3_FEATURE_INCOMPAT_EXTENTS |
@@ -180,7 +181,8 @@ static __u32 clear_ok_features[3] = {EXT3_FEATURE_COMPAT_HAS_JOURNAL |EXT2_FEATURE_COMPAT_RESIZE_INODE |EXT2_FEATURE_COMPAT_DIR_INDEX | -EXT4_FEATURE_COMPAT_FAST_COMMIT , +EXT4_FEATURE_COMPAT_FAST_COMMIT | +EXT4_FEATURE_COMPAT_STABLE_INODES ,/* Incompat */ EXT2_FEATURE_INCOMPAT_FILETYPE | EXT4_FEATURE_INCOMPAT_FLEX_BG |
resize/main.c +6 -0
@@ -605,6 +605,12 @@ int main (int argc, char ** argv)fprintf (stderr,_ ("The filesystem is already 32-bit.\n" ));exit (0 ); } +if (new_size <ext2fs_blocks_count (fs->super) && +ext2fs_has_feature_stable_inodes (fs->super)) { +fprintf (stderr,_ ("Cannot shrink this filesystem " +"because it has the stable_inodes feature flag.\n" )); +exit (1 ); + }if (mount_flags &EXT2_MF_MOUNTED ) { retval =online_resize_fs (fs, mtpt, &new_size, flags); }else {
Signature · 1 line
2.23.0.866.gb869b98d4c-goog
Theodore Y. Ts'o
maintainerQuoted 6 lines · Eric Biggers
From: Eric Biggers <[email protected]>
Reserve the codepoint for
EXT4_FEATURE_COMPAT_STABLE_INODES, allow it to be set and cleared, and teach resize2fs to forbid shrinking the filesystem if it is set.
Quoted 8 lines
This feature will allow the use of encryption policies where the inode number is included in the IVs (initialization vectors) for encryption, so data would be corrupted if the inodes were to be renumbered.
For more details, see the kernel patchset:
https://lkml.kernel.org/linux-fsdevel/[email protected]/T/#uSigned-off-by Eric Biggers <[email protected]>
Thanks, I've applied this as an AOSP cherry-pick. (I've also synchronized the upstream e2fsprogs git repo with the AOSP e2fsprogs repo as of 43f6f573dd61 and updated go/aosp-e2fsprogs-reconciliation. This commit is on the master branch, although the other AOSP commits, being bug fixes, were landed first on the maint branch and then merged into master.)
- Ted