hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

block: remove the partno field from struct hd_struct 

Just use the bd_partno field in struct block_device everywhere.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Jan Kara <jack@suse.cz>
Reviewed-by: Hannes Reinecke <hare@suse.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Christoph Hellwig 2020-11-24 09:37:14 +01:00 committed by Jens Axboe
parent 8446fe9255
commit 41e5c81984
4 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
block/genhd.c
View File

@ -589,8 +589,8 @@ int blk_alloc_devt(struct hd_struct *part, dev_t *devt)
int idx; int idx;
/* in consecutive minor range? */ /* in consecutive minor range? */
if (part->partno < disk->minors) { if (part->bdev->bd_partno < disk->minors) {
*devt = MKDEV(disk->major, disk->first_minor + part->partno); *devt = MKDEV(disk->major, disk->first_minor + part->bdev->bd_partno);
return 0; return 0;
} }
@ -864,7 +864,7 @@ void del_gendisk(struct gendisk *disk)
disk_part_iter_init(&piter, disk, disk_part_iter_init(&piter, disk,
DISK_PITER_INCL_EMPTY | DISK_PITER_REVERSE); DISK_PITER_INCL_EMPTY | DISK_PITER_REVERSE);
while ((part = disk_part_iter_next(&piter))) { while ((part = disk_part_iter_next(&piter))) {
invalidate_partition(disk, part->partno); invalidate_partition(disk, part->bdev->bd_partno);
delete_partition(part); delete_partition(part);
} }
disk_part_iter_exit(&piter); disk_part_iter_exit(&piter);
@ -1008,7 +1008,7 @@ void __init printk_all_partitions(void)
printk("%s%s %10llu %s %s", is_part0 ? "" : " ", printk("%s%s %10llu %s %s", is_part0 ? "" : " ",
bdevt_str(part_devt(part), devt_buf), bdevt_str(part_devt(part), devt_buf),
bdev_nr_sectors(part->bdev) >> 1, bdev_nr_sectors(part->bdev) >> 1,
disk_name(disk, part->partno, name_buf), disk_name(disk, part->bdev->bd_partno, name_buf),
part->bdev->bd_meta_info ? part->bdev->bd_meta_info ?
part->bdev->bd_meta_info->uuid : ""); part->bdev->bd_meta_info->uuid : "");
if (is_part0) { if (is_part0) {
@ -1102,7 +1102,7 @@ static int show_partition(struct seq_file *seqf, void *v)
seq_printf(seqf, "%4d %7d %10llu %s\n", seq_printf(seqf, "%4d %7d %10llu %s\n",
MAJOR(part_devt(part)), MINOR(part_devt(part)), MAJOR(part_devt(part)), MINOR(part_devt(part)),
bdev_nr_sectors(part->bdev) >> 1, bdev_nr_sectors(part->bdev) >> 1,
disk_name(sgp, part->partno, buf)); disk_name(sgp, part->bdev->bd_partno, buf));
disk_part_iter_exit(&piter); disk_part_iter_exit(&piter);
return 0; return 0;
@ -1525,7 +1525,7 @@ static int diskstats_show(struct seq_file *seqf, void *v)
"%lu %u" "%lu %u"
"\n", "\n",
MAJOR(part_devt(hd)), MINOR(part_devt(hd)), MAJOR(part_devt(hd)), MINOR(part_devt(hd)),
disk_name(gp, hd->partno, buf), disk_name(gp, hd->bdev->bd_partno, buf),
stat.ios[STAT_READ], stat.ios[STAT_READ],
stat.merges[STAT_READ], stat.merges[STAT_READ],
stat.sectors[STAT_READ], stat.sectors[STAT_READ],

9
block/partitions/core.c
View File

@ -184,7 +184,7 @@ static ssize_t part_partition_show(struct device *dev,
{ {
struct hd_struct *p = dev_to_part(dev); struct hd_struct *p = dev_to_part(dev);
return sprintf(buf, "%d\n", p->partno); return sprintf(buf, "%d\n", p->bdev->bd_partno);
} }
static ssize_t part_start_show(struct device *dev, static ssize_t part_start_show(struct device *dev,
@ -274,7 +274,7 @@ static int part_uevent(struct device *dev, struct kobj_uevent_env *env)
{ {
struct hd_struct *part = dev_to_part(dev); struct hd_struct *part = dev_to_part(dev);
add_uevent_var(env, "PARTN=%u", part->partno); add_uevent_var(env, "PARTN=%u", part->bdev->bd_partno);
if (part->bdev->bd_meta_info && part->bdev->bd_meta_info->volname[0]) if (part->bdev->bd_meta_info && part->bdev->bd_meta_info->volname[0])
add_uevent_var(env, "PARTNAME=%s", add_uevent_var(env, "PARTNAME=%s",
part->bdev->bd_meta_info->volname); part->bdev->bd_meta_info->volname);
@ -298,7 +298,7 @@ void delete_partition(struct hd_struct *part)
struct disk_part_tbl *ptbl = struct disk_part_tbl *ptbl =
rcu_dereference_protected(disk->part_tbl, 1); rcu_dereference_protected(disk->part_tbl, 1);
rcu_assign_pointer(ptbl->part[part->partno], NULL); rcu_assign_pointer(ptbl->part[part->bdev->bd_partno], NULL);
rcu_assign_pointer(ptbl->last_lookup, NULL); rcu_assign_pointer(ptbl->last_lookup, NULL);
kobject_put(part->bdev->bd_holder_dir); kobject_put(part->bdev->bd_holder_dir);
@ -372,7 +372,6 @@ static struct hd_struct *add_partition(struct gendisk *disk, int partno,
bdev->bd_start_sect = start; bdev->bd_start_sect = start;
bdev_set_nr_sectors(bdev, len); bdev_set_nr_sectors(bdev, len);
p->partno = partno;
bdev->bd_read_only = get_disk_ro(disk); bdev->bd_read_only = get_disk_ro(disk);
if (info) { if (info) {
@ -445,7 +444,7 @@ static bool partition_overlaps(struct gendisk *disk, sector_t start,
disk_part_iter_init(&piter, disk, DISK_PITER_INCL_EMPTY); disk_part_iter_init(&piter, disk, DISK_PITER_INCL_EMPTY);
while ((part = disk_part_iter_next(&piter))) { while ((part = disk_part_iter_next(&piter))) {
if (part->partno == skip_partno || if (part->bdev->bd_partno == skip_partno ||
start >= part->bdev->bd_start_sect + start >= part->bdev->bd_start_sect +
bdev_nr_sectors(part->bdev) || bdev_nr_sectors(part->bdev) ||
start + length <= part->bdev->bd_start_sect) start + length <= part->bdev->bd_start_sect)

1
include/linux/genhd.h
View File

@ -54,7 +54,6 @@ struct partition_meta_info {
struct hd_struct { struct hd_struct {
struct block_device *bdev; struct block_device *bdev;
struct device __dev; struct device __dev;
int partno;
}; };
/** /**

2
init/do_mounts.c
View File

@ -136,7 +136,7 @@ static dev_t devt_from_partuuid(const char *uuid_str)
struct hd_struct *part; struct hd_struct *part;
part = disk_get_part(dev_to_disk(dev), part = disk_get_part(dev_to_disk(dev),
dev_to_part(dev)->partno + offset); dev_to_part(dev)->bdev->bd_partno + offset);
if (part) { if (part) {
devt = part_devt(part); devt = part_devt(part);
put_device(part_to_dev(part)); put_device(part_to_dev(part));