redonkable/remarkable-linux
redonkable/remarkable-linux
1
0
Fork 0
Code Releases Activity

block: move capacity from disk to part0

Browse source 
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>
This commit is contained in:
Tejun Heo 2008-08-25 19:56:07 +09:00 committed by Jens Axboe
parent b5d0b9df0b
commit 80795aefb7
5 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/block/aoe/aoeblk.c
View file

@ -276,7 +276,7 @@ aoeblk_gdalloc(void *vp)
gd->first_minor = d->sysminor * AOE_PARTITIONS; gd->first_minor = d->sysminor * AOE_PARTITIONS;
gd->fops = &aoe_bdops; gd->fops = &aoe_bdops;
gd->private_data = d; gd->private_data = d;
gd->capacity = d->ssize; set_capacity(gd, d->ssize);
snprintf(gd->disk_name, sizeof gd->disk_name, "etherd/e%ld.%d", snprintf(gd->disk_name, sizeof gd->disk_name, "etherd/e%ld.%d",
d->aoemajor, d->aoeminor); d->aoemajor, d->aoeminor);

4
drivers/block/aoe/aoecmd.c
View file

@ -645,7 +645,7 @@ aoecmd_sleepwork(struct work_struct *work)
unsigned long flags; unsigned long flags;
u64 ssize; u64 ssize;
ssize = d->gd->capacity; ssize = get_capacity(d->gd);
bd = bdget_disk(d->gd, 0); bd = bdget_disk(d->gd, 0);
if (bd) { if (bd) {
@ -707,7 +707,7 @@ ataid_complete(struct aoedev *d, struct aoetgt *t, unsigned char *id)
if (d->flags & (DEVFL_GDALLOC|DEVFL_NEWSIZE)) if (d->flags & (DEVFL_GDALLOC|DEVFL_NEWSIZE))
return; return;
if (d->gd != NULL) { if (d->gd != NULL) {
d->gd->capacity = ssize; set_capacity(d->gd, ssize);
d->flags |= DEVFL_NEWSIZE; d->flags |= DEVFL_NEWSIZE;
} else } else
d->flags |= DEVFL_GDALLOC; d->flags |= DEVFL_GDALLOC;

2
drivers/block/aoe/aoedev.c
View file

@ -91,7 +91,7 @@ aoedev_downdev(struct aoedev *d)
} }
if (d->gd) if (d->gd)
d->gd->capacity = 0; set_capacity(d->gd, 0);
d->flags &= ~DEVFL_UP; d->flags &= ~DEVFL_UP;
} }

2
fs/partitions/check.c
View file

@ -586,7 +586,7 @@ void del_gendisk(struct gendisk *disk)
disk_part_iter_exit(&piter); disk_part_iter_exit(&piter);
invalidate_partition(disk, 0); invalidate_partition(disk, 0);
disk->capacity = 0; set_capacity(disk, 0);
disk->flags &= ~GENHD_FL_UP; disk->flags &= ~GENHD_FL_UP;
unlink_gendisk(disk); unlink_gendisk(disk);
disk_stat_set_all(disk, 0); disk_stat_set_all(disk, 0);

5
include/linux/genhd.h
View file

@ -138,7 +138,6 @@ struct gendisk {
struct block_device_operations *fops; struct block_device_operations *fops;
struct request_queue *queue; struct request_queue *queue;
void *private_data; void *private_data;
sector_t capacity;
int flags; int flags;
struct device *driverfs_dev; // FIXME: remove 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) 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) static inline void set_capacity(struct gendisk *disk, sector_t size)
{ {
disk->capacity = size; disk->part0.nr_sects = size;
} }
#ifdef CONFIG_SOLARIS_X86_PARTITION #ifdef CONFIG_SOLARIS_X86_PARTITION