diff options
Diffstat (limited to 'include/linux')
-rw-r--r-- | include/linux/fs.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/include/linux/fs.h b/include/linux/fs.h index 3984f2358d1f..fb2190349cdf 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h | |||
@@ -666,7 +666,7 @@ struct block_device { | |||
666 | int bd_holders; | 666 | int bd_holders; |
667 | bool bd_write_holder; | 667 | bool bd_write_holder; |
668 | #ifdef CONFIG_SYSFS | 668 | #ifdef CONFIG_SYSFS |
669 | struct gendisk * bd_holder_disk; /* for sysfs slave linkng */ | 669 | struct list_head bd_holder_disks; |
670 | #endif | 670 | #endif |
671 | struct block_device * bd_contains; | 671 | struct block_device * bd_contains; |
672 | unsigned bd_block_size; | 672 | unsigned bd_block_size; |
@@ -2058,12 +2058,18 @@ extern struct block_device *blkdev_get_by_dev(dev_t dev, fmode_t mode, | |||
2058 | extern int blkdev_put(struct block_device *bdev, fmode_t mode); | 2058 | extern int blkdev_put(struct block_device *bdev, fmode_t mode); |
2059 | #ifdef CONFIG_SYSFS | 2059 | #ifdef CONFIG_SYSFS |
2060 | extern int bd_link_disk_holder(struct block_device *bdev, struct gendisk *disk); | 2060 | extern int bd_link_disk_holder(struct block_device *bdev, struct gendisk *disk); |
2061 | extern void bd_unlink_disk_holder(struct block_device *bdev, | ||
2062 | struct gendisk *disk); | ||
2061 | #else | 2063 | #else |
2062 | static inline int bd_link_disk_holder(struct block_device *bdev, | 2064 | static inline int bd_link_disk_holder(struct block_device *bdev, |
2063 | struct gendisk *disk) | 2065 | struct gendisk *disk) |
2064 | { | 2066 | { |
2065 | return 0; | 2067 | return 0; |
2066 | } | 2068 | } |
2069 | static inline void bd_unlink_disk_holder(struct block_device *bdev, | ||
2070 | struct gendisk *disk) | ||
2071 | { | ||
2072 | } | ||
2067 | #endif | 2073 | #endif |
2068 | #endif | 2074 | #endif |
2069 | 2075 | ||