Merge tag 'fsverity-for-linus' of git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt

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

diff --git a/include/linux/fs.h b/include/linux/fs.h
index b3a0f5bfb06d7d48273be49691146d204021ac1c..104a727f8a67373a3b473d7c99ae8000b9f1cd4a 100644 (file)
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -1433,6 +1433,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 */
 #endif
 #ifdef CONFIG_FS_VERITY
        const struct fsverity_operations *s_vop;
@@ -2609,6 +2610,12 @@ extern struct block_device *blkdev_get_by_path(const char *path, fmode_t mode,
                                               void *holder);
 extern struct block_device *blkdev_get_by_dev(dev_t dev, fmode_t mode,
                                              void *holder);
+extern struct block_device *bd_start_claiming(struct block_device *bdev,
+                                             void *holder);
+extern void bd_finish_claiming(struct block_device *bdev,
+                              struct block_device *whole, void *holder);
+extern void bd_abort_claiming(struct block_device *bdev,
+                             struct block_device *whole, void *holder);
 extern void blkdev_put(struct block_device *bdev, fmode_t mode);
 extern int __blkdev_reread_part(struct block_device *bdev);
 extern int blkdev_reread_part(struct block_device *bdev);