History

Merge tag 'fsverity-for-linus' of git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt

Pull fsverity updates from Eric Biggers: "Expose the fs-verity bit through statx()" * tag 'fsverity-for-linus' of git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt: docs: fs-verity: mention statx() support f2fs: support STATX_ATTR_VERITY ext4: support STATX_ATTR_VERITY statx: define STATX_ATTR_VERITY docs: fs-verity: document first supported kernel version

Linus Torvalds committed 6 years ago

Commit 1c1ff482 parents ea4b71b 73f0ec05 files · +21 −6Browse files

Showing the changes to include/uapi/linux (1 of 5 files). Show all

Unified · Split

include/uapi/linux/stat.h+1−1
@@ -167,8 +167,8 @@ struct statx { · 166 unmodified lines
167167 #define STATX_ATTR_APPEND 0x00000020 /* [I] File is append-only */
168168 #define STATX_ATTR_NODUMP 0x00000040 /* [I] File is not to be dumped */
169169 #define STATX_ATTR_ENCRYPTED 0x00000800 /* [I] File requires key to decrypt in fs */
170−
171170 #define STATX_ATTR_AUTOMOUNT 0x00001000 /* Dir: Automount trigger */
171+#define STATX_ATTR_VERITY 0x00100000 /* [I] Verity protected file */
172172
173173
174174 #endif /* _UAPI_LINUX_STAT_H */