f2fs: use macro instead of f2fs verity version
PATCH v2 1/1 f2fs: use macro instead of f2fs verity version
Because fsverity_descriptor_location.version is constant, so use macro for better reading.
Signed-off-by Jack Qiu <[email protected]>
--- fs/f2fs/verity.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
fs/f2fs/verity.c +4 -2
@@ -29,6 +29,8 @@#include "f2fs.h" #include "xattr.h" +#define F2FS_VERIFY_VER (1) +static inline loff_t f2fs_verity_metadata_pos (const struct inode *inode) {return round_up (inode->i_size,65536 );
@@ -152,7 +154,7 @@ static int f2fs_end_enable_verity(struct file *filp, const void *desc,struct inode *inode =file_inode (filp);u64 desc_pos =f2fs_verity_metadata_pos (inode) + merkle_tree_size;struct fsverity_descriptor_location dloc = { - .version =cpu_to_le32 (1 ), + .version =cpu_to_le32 (F2FS_VERIFY_VER ), .size =cpu_to_le32 (desc_size), .pos =cpu_to_le64 (desc_pos), };
@@ -199,7 +201,7 @@ static int f2fs_get_verity_descriptor(struct inode *inode, void *buf, F2FS_XATTR_NAME_VERITY, &dloc, sizeof(dloc), NULL);if (res <0 && res != -ERANGE )return res; -if (res !=sizeof (dloc) || dloc.version !=cpu_to_le32 (1 )) { +if (res !=sizeof (dloc) || dloc.version !=cpu_to_le32 (F2FS_VERIFY_VER )) {f2fs_warn (F2FS_I_SB (inode),"unknown verity xattr format" );return -EINVAL ; }
--
2.17.1
_______________________________________________
Linux-f2fs-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
Quoted 4 lines · Jack Qiu
Because fsverity_descriptor_location.version is constant, so use macro for better reading.
Signed-off-by Jack Qiu<[email protected]>
Reviewed-by Chao Yu <[email protected]>
Thanks,
_______________________________________________
Linux-f2fs-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel