diff options
| author | Eric Biggers <ebiggers@google.com> | 2022-12-23 12:36:38 -0800 |
|---|---|---|
| committer | Eric Biggers <ebiggers@google.com> | 2023-01-09 19:06:09 -0800 |
| commit | db85d14dc5c566879a01c4928b2f6f4d5cf0f939 (patch) | |
| tree | 9106fdb1ba7bca9d8c805f21757141010517b557 | |
| parent | 4fa512ce70515ac0d59e30a4b7ae0888b117d8a2 (diff) | |
| download | linux-db85d14dc5c566879a01c4928b2f6f4d5cf0f939.tar.gz linux-db85d14dc5c566879a01c4928b2f6f4d5cf0f939.tar.bz2 linux-db85d14dc5c566879a01c4928b2f6f4d5cf0f939.zip | |
ext4: allow verity with fs block size < PAGE_SIZE
Now that the needed changes have been made to fs/buffer.c, ext4 is ready
to support the verity feature when the filesystem block size is less
than the page size. So remove the mount-time check that prevented this.
Signed-off-by: Eric Biggers <ebiggers@google.com>
Tested-by: Ojaswin Mujoo <ojaswin@linux.ibm.com>
Link: https://lore.kernel.org/r/20221223203638.41293-12-ebiggers@kernel.org
| -rw-r--r-- | Documentation/filesystems/fsverity.rst | 8 | ||||
| -rw-r--r-- | fs/ext4/super.c | 5 |
2 files changed, 5 insertions, 8 deletions
diff --git a/Documentation/filesystems/fsverity.rst b/Documentation/filesystems/fsverity.rst index 948d20254524..c0c8a25b41bb 100644 --- a/Documentation/filesystems/fsverity.rst +++ b/Documentation/filesystems/fsverity.rst @@ -497,9 +497,11 @@ To create verity files on an ext4 filesystem, the filesystem must have been formatted with ``-O verity`` or had ``tune2fs -O verity`` run on it. "verity" is an RO_COMPAT filesystem feature, so once set, old kernels will only be able to mount the filesystem readonly, and old -versions of e2fsck will be unable to check the filesystem. Moreover, -currently ext4 only supports mounting a filesystem with the "verity" -feature when its block size is equal to PAGE_SIZE (often 4096 bytes). +versions of e2fsck will be unable to check the filesystem. + +Originally, an ext4 filesystem with the "verity" feature could only be +mounted when its block size was equal to the system page size +(typically 4096 bytes). In Linux v6.3, this limitation was removed. ext4 sets the EXT4_VERITY_FL on-disk inode flag on verity files. It can only be set by `FS_IOC_ENABLE_VERITY`_, and it cannot be cleared. diff --git a/fs/ext4/super.c b/fs/ext4/super.c index 260c1b3e3ef2..b31db521d6bf 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c @@ -5336,11 +5336,6 @@ static int __ext4_fill_super(struct fs_context *fc, struct super_block *sb) } } - if (ext4_has_feature_verity(sb) && sb->s_blocksize != PAGE_SIZE) { - ext4_msg(sb, KERN_ERR, "Unsupported blocksize for fs-verity"); - goto failed_mount_wq; - } - /* * Get the # of file system overhead blocks from the * superblock if present. |