[f2fs-dev] [PATCH V2 6/7] f2fs: use IS_VERITY() to check inode's fsverity status

[Chandan Rajendra]

This commit now uses IS_VERITY() macro to check if fsverity is
enabled on an inode.

Acked-by: Chao Yu <yuch...@huawei.com>
Signed-off-by: Chandan Rajendra <chan...@linux.vnet.ibm.com>
---
 fs/f2fs/file.c  | 6 +++---
 fs/f2fs/inode.c | 4 +++-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c
index 6c7ad15000b9..2eb4821d95d1 100644
--- a/fs/f2fs/file.c
+++ b/fs/f2fs/file.c
@@ -491,7 +491,7 @@ static int f2fs_file_open(struct inode *inode, struct file 
*filp)
        if (err)
                return err;
 
-       if (f2fs_verity_file(inode)) {
+       if (IS_VERITY(inode)) {
                err = fsverity_file_open(inode, filp);
                if (err)
                        return err;
@@ -701,7 +701,7 @@ int f2fs_getattr(const struct path *path, struct kstat 
*stat,
        struct f2fs_inode *ri;
        unsigned int flags;
 
-       if (f2fs_verity_file(inode)) {
+       if (IS_VERITY(inode)) {
                /*
                 * For fs-verity we need to override i_size with the original
                 * data i_size.  This requires I/O to the file which with
@@ -800,7 +800,7 @@ int f2fs_setattr(struct dentry *dentry, struct iattr *attr)
        if (err)
                return err;
 
-       if (f2fs_verity_file(inode)) {
+       if (IS_VERITY(inode)) {
                err = fsverity_prepare_setattr(dentry, attr);
                if (err)
                        return err;
diff --git a/fs/f2fs/inode.c b/fs/f2fs/inode.c
index ddef483ad689..02806feed64c 100644
--- a/fs/f2fs/inode.c
+++ b/fs/f2fs/inode.c
@@ -45,9 +45,11 @@ void f2fs_set_inode_flags(struct inode *inode)
                new_fl |= S_DIRSYNC;
        if (f2fs_encrypted_inode(inode))
                new_fl |= S_ENCRYPTED;
+       if (f2fs_verity_file(inode))
+               new_fl |= S_VERITY;
        inode_set_flags(inode, new_fl,
                        S_SYNC|S_APPEND|S_IMMUTABLE|S_NOATIME|S_DIRSYNC|
-                       S_ENCRYPTED);
+                       S_ENCRYPTED|S_VERITY);
 }
 
 static void __get_inode_rdev(struct inode *inode, struct f2fs_inode *ri)
-- 
2.19.1



_______________________________________________
Linux-f2fs-devel mailing list
Linux-f2fs-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel