block: remove ->bd_contains

[linux-2.6-microblaze.git] / include / linux / blk_types.h

diff --git a/include/linux/blk_types.h b/include/linux/blk_types.h
index 9698f45..2e0a9bd 100644 (file)
--- a/include/linux/blk_types.h
+++ b/include/linux/blk_types.h
@@ -32,7 +32,6 @@ struct block_device {
 #ifdef CONFIG_SYSFS
        struct list_head        bd_holder_disks;
 #endif
-       struct block_device *   bd_contains;
        u8                      bd_partno;
        struct hd_struct *      bd_part;
        /* number of times partitions within this device have been opened. */
@@ -49,6 +48,9 @@ struct block_device {
        struct super_block      *bd_fsfreeze_sb;
 } __randomize_layout;
 
+#define bdev_whole(_bdev) \
+       ((_bdev)->bd_disk->part0.bdev)
+
 #define bdev_kobj(_bdev) \
        (&part_to_dev((_bdev)->bd_part)->kobj)