Merge tag 'y2038-vfs' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/playground

[linux-2.6-block.git] / fs / ext4 / super.c

diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index 3ea2d60f33aab7c1801ce9e3a7da8cf496470c65..3db5f17228b7691f9208252e937c16349d486e12 100644 (file)
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -1107,6 +1107,9 @@ static int ext4_drop_inode(struct inode *inode)
 {
        int drop = generic_drop_inode(inode);
 
+       if (!drop)
+               drop = fscrypt_drop_inode(inode);
+
        trace_ext4_drop_inode(inode, drop);
        return drop;
 }
@@ -1179,6 +1182,7 @@ void ext4_clear_inode(struct inode *inode)
                EXT4_I(inode)->jinode = NULL;
        }
        fscrypt_put_encryption_info(inode);
+       fsverity_cleanup_inode(inode);
 }
 
 static struct inode *ext4_nfs_get_inode(struct super_block *sb,
@@ -4285,6 +4289,9 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent)
 #ifdef CONFIG_FS_ENCRYPTION
        sb->s_cop = &ext4_cryptops;
 #endif
+#ifdef CONFIG_FS_VERITY
+       sb->s_vop = &ext4_verityops;
+#endif
 #ifdef CONFIG_QUOTA
        sb->dq_op = &ext4_quota_operations;
        if (ext4_has_feature_quota(sb))
@@ -4432,6 +4439,11 @@ no_journal:
                goto failed_mount_wq;
        }
 
+       if (ext4_has_feature_verity(sb) && blocksize != PAGE_SIZE) {
+               ext4_msg(sb, KERN_ERR, "Unsupported blocksize for fs-verity");
+               goto failed_mount_wq;
+       }
+
        if (DUMMY_ENCRYPTION_ENABLED(sbi) && !sb_rdonly(sb) &&
            !ext4_has_feature_encrypt(sb)) {
                ext4_set_feature_encrypt(sb);
@@ -6107,6 +6119,10 @@ static int __init ext4_init_fs(void)
                return err;
 
        err = ext4_init_pending();
+       if (err)
+               goto out7;
+
+       err = ext4_init_post_read_processing();
        if (err)
                goto out6;
 
@@ -6148,8 +6164,10 @@ out3:
 out4:
        ext4_exit_pageio();
 out5:
-       ext4_exit_pending();
+       ext4_exit_post_read_processing();
 out6:
+       ext4_exit_pending();
+out7:
        ext4_exit_es();
 
        return err;
@@ -6166,6 +6184,7 @@ static void __exit ext4_exit_fs(void)
        ext4_exit_sysfs();
        ext4_exit_system_zone();
        ext4_exit_pageio();
+       ext4_exit_post_read_processing();
        ext4_exit_es();
        ext4_exit_pending();
 }