Merge remote-tracking branch 'ovl/for-viro' into for-linus

[karo-tx-linux.git] / include / linux / fs.h

diff --git a/include/linux/fs.h b/include/linux/fs.h
index 72a33007ec24ba8ec77b91cbb23580c28d808724..f45809ce0fe7bbb61483b4bbe1dad659c5a35b66 100644 (file)
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -423,6 +423,7 @@ struct block_device {
        int                     bd_invalidated;
        struct gendisk *        bd_disk;
        struct request_queue *  bd_queue;
+       struct backing_dev_info *bd_bdi;
        struct list_head        bd_list;
        /*
         * Private data.  You must have bd_claim'ed the block_device
@@ -2355,6 +2356,7 @@ extern struct kmem_cache *names_cachep;
 #ifdef CONFIG_BLOCK
 extern int register_blkdev(unsigned int, const char *);
 extern void unregister_blkdev(unsigned int, const char *);
+extern void bdev_unhash_inode(dev_t dev);
 extern struct block_device *bdget(dev_t);
 extern struct block_device *bdgrab(struct block_device *bdev);
 extern void bd_set_size(struct block_device *, loff_t size);