Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 80795aef authored by Tejun Heo's avatar Tejun Heo Committed by Jens Axboe
Browse files

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: default avatarTejun Heo <tj@kernel.org>
Signed-off-by: default avatarJens Axboe <jens.axboe@oracle.com>
parent b5d0b9df

drivers/block/aoe/aoeblk.c

+1 −1
Original line number Diff line number Diff line
@@ -276,7 +276,7 @@ aoeblk_gdalloc(void *vp) 
	gd->first_minor = d->sysminor * AOE_PARTITIONS;

	gd->fops = &aoe_bdops;

	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",

		d->aoemajor, d->aoeminor);

drivers/block/aoe/aoecmd.c

+2 −2
Original line number Diff line number Diff line
@@ -645,7 +645,7 @@ aoecmd_sleepwork(struct work_struct *work) 
		unsigned long flags;

		u64 ssize;



		ssize = d->gd->capacity;

		ssize = get_capacity(d->gd);

		bd = bdget_disk(d->gd, 0);



		if (bd) {
@@ -707,7 +707,7 @@ ataid_complete(struct aoedev *d, struct aoetgt *t, unsigned char *id) 
	if (d->flags & (DEVFL_GDALLOC|DEVFL_NEWSIZE))

		return;

	if (d->gd != NULL) {

		d->gd->capacity = ssize;

		set_capacity(d->gd, ssize);

		d->flags |= DEVFL_NEWSIZE;

	} else

		d->flags |= DEVFL_GDALLOC;

drivers/block/aoe/aoedev.c

+1 −1
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ aoedev_downdev(struct aoedev *d) 
	}



	if (d->gd)

		d->gd->capacity = 0;

		set_capacity(d->gd, 0);



	d->flags &= ~DEVFL_UP;

}

fs/partitions/check.c

+1 −1
Original line number Diff line number Diff line
@@ -586,7 +586,7 @@ void del_gendisk(struct gendisk *disk) 
	disk_part_iter_exit(&piter);



	invalidate_partition(disk, 0);

	disk->capacity = 0;

	set_capacity(disk, 0);

	disk->flags &= ~GENHD_FL_UP;

	unlink_gendisk(disk);

	disk_stat_set_all(disk, 0);

include/linux/genhd.h

+2 −3
Original line number Diff line number Diff line
@@ -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