diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/genhd.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/include/linux/genhd.h b/include/linux/genhd.h index 9e866a2aee50..1cf828148ec6 100644 --- a/include/linux/genhd.h +++ b/include/linux/genhd.h | |||
@@ -138,7 +138,6 @@ struct gendisk { | |||
138 | struct block_device_operations *fops; | 138 | struct block_device_operations *fops; |
139 | struct request_queue *queue; | 139 | struct request_queue *queue; |
140 | void *private_data; | 140 | void *private_data; |
141 | sector_t capacity; | ||
142 | 141 | ||
143 | int flags; | 142 | int flags; |
144 | struct device *driverfs_dev; // FIXME: remove | 143 | struct device *driverfs_dev; // FIXME: remove |
@@ -411,11 +410,11 @@ static inline sector_t get_start_sect(struct block_device *bdev) | |||
411 | } | 410 | } |
412 | static inline sector_t get_capacity(struct gendisk *disk) | 411 | static inline sector_t get_capacity(struct gendisk *disk) |
413 | { | 412 | { |
414 | return disk->capacity; | 413 | return disk->part0.nr_sects; |
415 | } | 414 | } |
416 | static inline void set_capacity(struct gendisk *disk, sector_t size) | 415 | static inline void set_capacity(struct gendisk *disk, sector_t size) |
417 | { | 416 | { |
418 | disk->capacity = size; | 417 | disk->part0.nr_sects = size; |
419 | } | 418 | } |
420 | 419 | ||
421 | #ifdef CONFIG_SOLARIS_X86_PARTITION | 420 | #ifdef CONFIG_SOLARIS_X86_PARTITION |