Merge tag 'pull-file' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[linux-block.git] / include / linux / fs.h

diff --git a/include/linux/fs.h b/include/linux/fs.h
index c40f68f629417448dc5612c3cf1b869677fb274d..7591d2d2dcbba9a0a1e501a3759c23f195caade6 100644 (file)
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -1472,7 +1472,7 @@ struct super_block {
        const struct xattr_handler **s_xattr;
 #ifdef CONFIG_FS_ENCRYPTION
        const struct fscrypt_operations *s_cop;
-       struct key              *s_master_keys; /* master crypto keys in use */
+       struct fscrypt_keyring  *s_master_keys; /* master crypto keys in use */
 #endif
 #ifdef CONFIG_FS_VERITY
        const struct fsverity_operations *s_vop;