Merge tag 'f2fs-for-5.4' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk...

[linux-2.6-block.git] / fs / f2fs / inode.c

diff --git a/fs/f2fs/inode.c b/fs/f2fs/inode.c
index 87214414936b4c5305d92299ab0e2b24dcc7df28..db4fec30c30dfc4a2163246f3baa2007f49a2c2f 100644 (file)
--- a/fs/f2fs/inode.c
+++ b/fs/f2fs/inode.c
@@ -46,11 +46,13 @@ void f2fs_set_inode_flags(struct inode *inode)
                new_fl |= S_DIRSYNC;
        if (file_is_encrypt(inode))
                new_fl |= S_ENCRYPTED;
+       if (file_is_verity(inode))
+               new_fl |= S_VERITY;
        if (flags & F2FS_CASEFOLD_FL)
                new_fl |= S_CASEFOLD;
        inode_set_flags(inode, new_fl,
                        S_SYNC|S_APPEND|S_IMMUTABLE|S_NOATIME|S_DIRSYNC|
-                       S_ENCRYPTED|S_CASEFOLD);
+                       S_ENCRYPTED|S_VERITY|S_CASEFOLD);
 }
 
 static void __get_inode_rdev(struct inode *inode, struct f2fs_inode *ri)
@@ -736,6 +738,7 @@ no_delete:
        }
 out_clear:
        fscrypt_put_encryption_info(inode);
+       fsverity_cleanup_inode(inode);
        clear_inode(inode);
 }