summaryrefslogtreecommitdiffstats
path: root/include/linux/genhd.h
diff options
context:
space:
mode:
authorTejun Heo <tj@kernel.org>2008-08-25 19:56:07 +0900
committerJens Axboe <jens.axboe@oracle.com>2008-10-09 08:56:07 +0200
commit80795aefb76d10c5d698e60c7e7750b5330787da (patch)
treef22a55483cb2fe77580ee1507c1124bc73b93c3d /include/linux/genhd.h
parentb5d0b9df0ba5d9a044f3a21e7544f53d90bd1465 (diff)
downloadlinux-80795aefb76d10c5d698e60c7e7750b5330787da.tar.gz
linux-80795aefb76d10c5d698e60c7e7750b5330787da.tar.bz2
linux-80795aefb76d10c5d698e60c7e7750b5330787da.zip
block: move capacity from disk to part0
Move disk->capacity to part0->nr_sects and convert all users who directly accessed the field to use {get|set}_capacity(). This is done early to allow the __dev field to be moved. Signed-off-by: Tejun Heo <tj@kernel.org> Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Diffstat (limited to 'include/linux/genhd.h')
-rw-r--r--include/linux/genhd.h5
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 {
struct block_device_operations *fops;
struct request_queue *queue;
void *private_data;
- sector_t capacity;
int flags;
struct device *driverfs_dev; // FIXME: remove
@@ -411,11 +410,11 @@ static inline sector_t get_start_sect(struct block_device *bdev)
}
static inline sector_t get_capacity(struct gendisk *disk)
{
- return disk->capacity;
+ return disk->part0.nr_sects;
}
static inline void set_capacity(struct gendisk *disk, sector_t size)
{
- disk->capacity = size;
+ disk->part0.nr_sects = size;
}
#ifdef CONFIG_SOLARIS_X86_PARTITION