Commit 8fa41016 authored by Jack Qiu's avatar Jack Qiu Committed by Jaegeuk Kim

f2fs: use macro instead of f2fs verity version

Because fsverity_descriptor_location.version is constant,
so use macro for better reading.
Signed-off-by: default avatarJack Qiu <jack.qiu@huawei.com>
Reviewed-by: default avatarChao Yu <yuchao0@huawei.com>
Signed-off-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>
parent 1fd28018
...@@ -29,6 +29,8 @@ ...@@ -29,6 +29,8 @@
#include "f2fs.h" #include "f2fs.h"
#include "xattr.h" #include "xattr.h"
#define F2FS_VERIFY_VER (1)
static inline loff_t f2fs_verity_metadata_pos(const struct inode *inode) static inline loff_t f2fs_verity_metadata_pos(const struct inode *inode)
{ {
return round_up(inode->i_size, 65536); return round_up(inode->i_size, 65536);
...@@ -152,7 +154,7 @@ static int f2fs_end_enable_verity(struct file *filp, const void *desc, ...@@ -152,7 +154,7 @@ static int f2fs_end_enable_verity(struct file *filp, const void *desc,
struct inode *inode = file_inode(filp); struct inode *inode = file_inode(filp);
u64 desc_pos = f2fs_verity_metadata_pos(inode) + merkle_tree_size; u64 desc_pos = f2fs_verity_metadata_pos(inode) + merkle_tree_size;
struct fsverity_descriptor_location dloc = { struct fsverity_descriptor_location dloc = {
.version = cpu_to_le32(1), .version = cpu_to_le32(F2FS_VERIFY_VER),
.size = cpu_to_le32(desc_size), .size = cpu_to_le32(desc_size),
.pos = cpu_to_le64(desc_pos), .pos = cpu_to_le64(desc_pos),
}; };
...@@ -199,7 +201,7 @@ static int f2fs_get_verity_descriptor(struct inode *inode, void *buf, ...@@ -199,7 +201,7 @@ static int f2fs_get_verity_descriptor(struct inode *inode, void *buf,
F2FS_XATTR_NAME_VERITY, &dloc, sizeof(dloc), NULL); F2FS_XATTR_NAME_VERITY, &dloc, sizeof(dloc), NULL);
if (res < 0 && res != -ERANGE) if (res < 0 && res != -ERANGE)
return res; 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"); f2fs_warn(F2FS_I_SB(inode), "unknown verity xattr format");
return -EINVAL; return -EINVAL;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment