diff options
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/genhd.h | 11 | ||||
| -rw-r--r-- | include/linux/ide.h | 1 | ||||
| -rw-r--r-- | include/linux/raid/md.h | 1 |
3 files changed, 7 insertions, 6 deletions
diff --git a/include/linux/genhd.h b/include/linux/genhd.h index 0bd31339d6f5..ecd747fbe569 100644 --- a/include/linux/genhd.h +++ b/include/linux/genhd.h @@ -79,11 +79,14 @@ struct gendisk { struct hd_struct *part; /* [indexed by minor] */ struct gendisk *next; struct block_device_operations *fops; + sector_t capacity; - devfs_handle_t de; - struct device *driverfs_dev; int flags; int number; /* devfs crap */ + devfs_handle_t de; /* more of the same */ + devfs_handle_t disk_de; /* piled higher and deeper */ + struct device *driverfs_dev; + struct device disk_dev; }; /* drivers/block/genhd.c */ @@ -97,11 +100,11 @@ static inline unsigned long get_start_sect(struct block_device *bdev) } static inline sector_t get_capacity(struct gendisk *disk) { - return disk->part[0].nr_sects; + return disk->capacity; } static inline void set_capacity(struct gendisk *disk, sector_t size) { - disk->part[0].nr_sects = size; + disk->capacity = size; } #endif /* __KERNEL__ */ diff --git a/include/linux/ide.h b/include/linux/ide.h index 501b97902799..936a8eb9132d 100644 --- a/include/linux/ide.h +++ b/include/linux/ide.h @@ -508,7 +508,6 @@ typedef struct ide_drive_s { struct hwif_s *hwif; /* actually (ide_hwif_t *) */ wait_queue_head_t wqueue; /* used to wait for drive in open() */ struct hd_driveid *id; /* drive model identification info */ - struct hd_struct *part; /* drive partition table */ char name[4]; /* drive name, such as "hda" */ struct ide_driver_s *driver; /* (ide_driver_t *) */ void *driver_data; /* extra driver data */ diff --git a/include/linux/raid/md.h b/include/linux/raid/md.h index a9cca6e4da8f..f95cdf658a39 100644 --- a/include/linux/raid/md.h +++ b/include/linux/raid/md.h @@ -61,7 +61,6 @@ #define MD_PATCHLEVEL_VERSION 0 extern int md_size[MAX_MD_DEVS]; -extern struct hd_struct md_hd_struct[MAX_MD_DEVS]; extern char * partition_name (kdev_t dev); extern inline char * bdev_partition_name (struct block_device *bdev) |