From: Jaegeuk Kim <jaegeuk@kernel.org>
To: Jack Qiu <jack.qiu@huawei.com>
Cc: linux-f2fs-devel@lists.sourceforge.net
Subject: Re: [f2fs-dev] [PATCH] f2fs: use macro instead of f2fs verity version
Date: Sun, 26 Jul 2020 08:12:20 -0700 [thread overview]
Message-ID: <20200726151220.GA2155900@google.com> (raw)
In-Reply-To: <20200725031340.21934-1-jack.qiu@huawei.com>
On 07/25, Jack Qiu wrote:
> Because fsverity_descriptor_location.version is constant,
> so use macro for better reading.
>
> Signed-off-by: Jack Qiu <jack.qiu@huawei.com>
> ---
> fs/f2fs/verity.c | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/fs/f2fs/verity.c b/fs/f2fs/verity.c
> index 865c9fb774fb..5be8a5790907 100644
> --- a/fs/f2fs/verity.c
> +++ b/fs/f2fs/verity.c
> @@ -29,6 +29,8 @@
> #include "f2fs.h"
> #include "xattr.h"
>
> +#define F2FS_VERIFY_VER cpu_to_le32(1)
Should be like this?
#define F2FS_VERITY_VER 1
And, use cpu_to_le32(F2FS_VERITY_VER) below?
> +
> 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 = 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 != F2FS_VERIFY_VER) {
> f2fs_warn(F2FS_I_SB(inode), "unknown verity xattr format");
> return -EINVAL;
> }
> --
> 2.17.1
>
>
>
> _______________________________________________
> Linux-f2fs-devel mailing list
> Linux-f2fs-devel@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
_______________________________________________
Linux-f2fs-devel mailing list
Linux-f2fs-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
next prev parent reply other threads:[~2020-07-26 15:12 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-25 3:13 [f2fs-dev] [PATCH] f2fs: use macro instead of f2fs verity version Jack Qiu
2020-07-26 15:12 ` Jaegeuk Kim [this message]
-- strict thread matches above, loose matches on Subject: below --
2020-07-29 0:30 Qiujie (Jack)
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200726151220.GA2155900@google.com \
--to=jaegeuk@kernel.org \
--cc=jack.qiu@huawei.com \
--cc=linux-f2fs-devel@lists.sourceforge.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.