| Message ID | 20201126130422.92945-36-hch@lst.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [01/44] blk-cgroup: fix a hd_struct leak in blkcg_fill_root_iostats | expand |
On Thu 26-11-20 14:04:13, Christoph Hellwig wrote: > Move the policy field to struct block_device and rename it to the > more descriptive bd_read_only. Also turn the field into a bool as it > is used as such. > > Signed-off-by: Christoph Hellwig <hch@lst.de> Looks good. You can add: Reviewed-by: Jan Kara <jack@suse.cz> Honza > --- > block/blk-core.c | 2 +- > block/genhd.c | 8 ++++---- > block/ioctl.c | 2 +- > block/partitions/core.c | 4 ++-- > include/linux/blk_types.h | 1 + > include/linux/genhd.h | 4 ++-- > 6 files changed, 11 insertions(+), 10 deletions(-) > > diff --git a/block/blk-core.c b/block/blk-core.c > index 9121390be97a76..d64ffcb6f9ae5d 100644 > --- a/block/blk-core.c > +++ b/block/blk-core.c > @@ -696,7 +696,7 @@ static inline bool bio_check_ro(struct bio *bio, struct hd_struct *part) > { > const int op = bio_op(bio); > > - if (part->policy && op_is_write(op)) { > + if (part->bdev->bd_read_only && op_is_write(op)) { > char b[BDEVNAME_SIZE]; > > if (op_is_flush(bio->bi_opf) && !bio_sectors(bio)) > diff --git a/block/genhd.c b/block/genhd.c > index 0371558ccde14c..ae312ccc6dd7c0 100644 > --- a/block/genhd.c > +++ b/block/genhd.c > @@ -1679,14 +1679,14 @@ void set_disk_ro(struct gendisk *disk, int flag) > struct disk_part_iter piter; > struct hd_struct *part; > > - if (disk->part0.policy != flag) { > + if (disk->part0.bdev->bd_read_only != flag) { > set_disk_ro_uevent(disk, flag); > - disk->part0.policy = flag; > + disk->part0.bdev->bd_read_only = flag; > } > > disk_part_iter_init(&piter, disk, DISK_PITER_INCL_EMPTY); > while ((part = disk_part_iter_next(&piter))) > - part->policy = flag; > + part->bdev->bd_read_only = flag; > disk_part_iter_exit(&piter); > } > > @@ -1696,7 +1696,7 @@ int bdev_read_only(struct block_device *bdev) > { > if (!bdev) > return 0; > - return bdev->bd_part->policy; > + return bdev->bd_read_only; > } > > EXPORT_SYMBOL(bdev_read_only); > diff --git a/block/ioctl.c b/block/ioctl.c > index a6d8171221c7dc..d61d652078f41c 100644 > --- a/block/ioctl.c > +++ b/block/ioctl.c > @@ -345,7 +345,7 @@ static int blkdev_roset(struct block_device *bdev, fmode_t mode, > if (ret) > return ret; > } > - bdev->bd_part->policy = n; > + bdev->bd_read_only = n; > return 0; > } > > diff --git a/block/partitions/core.c b/block/partitions/core.c > index d1093adf2570e2..f397ec9922bd6e 100644 > --- a/block/partitions/core.c > +++ b/block/partitions/core.c > @@ -199,7 +199,7 @@ static ssize_t part_ro_show(struct device *dev, > struct device_attribute *attr, char *buf) > { > struct hd_struct *p = dev_to_part(dev); > - return sprintf(buf, "%d\n", p->policy ? 1 : 0); > + return sprintf(buf, "%d\n", p->bdev->bd_read_only); > } > > static ssize_t part_alignment_offset_show(struct device *dev, > @@ -420,7 +420,7 @@ static struct hd_struct *add_partition(struct gendisk *disk, int partno, > bdev->bd_start_sect = start; > bdev_set_nr_sectors(bdev, len); > p->partno = partno; > - p->policy = get_disk_ro(disk); > + bdev->bd_read_only = get_disk_ro(disk); > > if (info) { > err = -ENOMEM; > diff --git a/include/linux/blk_types.h b/include/linux/blk_types.h > index b237f1e4081405..758cf71c9aa2a6 100644 > --- a/include/linux/blk_types.h > +++ b/include/linux/blk_types.h > @@ -23,6 +23,7 @@ struct block_device { > sector_t bd_start_sect; > struct disk_stats __percpu *bd_stats; > unsigned long bd_stamp; > + bool bd_read_only; /* read-only policy */ > dev_t bd_dev; > int bd_openers; > struct inode * bd_inode; /* will die */ > diff --git a/include/linux/genhd.h b/include/linux/genhd.h > index 349cf6403ccddc..dcbf9ef7610ea6 100644 > --- a/include/linux/genhd.h > +++ b/include/linux/genhd.h > @@ -55,7 +55,7 @@ struct hd_struct { > > struct block_device *bdev; > struct device __dev; > - int policy, partno; > + int partno; > struct rcu_work rcu_work; > }; > > @@ -278,7 +278,7 @@ extern void set_disk_ro(struct gendisk *disk, int flag); > > static inline int get_disk_ro(struct gendisk *disk) > { > - return disk->part0.policy; > + return disk->part0.bdev->bd_read_only; > } > > extern void disk_block_events(struct gendisk *disk); > -- > 2.29.2 >
diff --git a/block/blk-core.c b/block/blk-core.c index 9121390be97a76..d64ffcb6f9ae5d 100644 --- a/block/blk-core.c +++ b/block/blk-core.c @@ -696,7 +696,7 @@ static inline bool bio_check_ro(struct bio *bio, struct hd_struct *part) { const int op = bio_op(bio); - if (part->policy && op_is_write(op)) { + if (part->bdev->bd_read_only && op_is_write(op)) { char b[BDEVNAME_SIZE]; if (op_is_flush(bio->bi_opf) && !bio_sectors(bio)) diff --git a/block/genhd.c b/block/genhd.c index 0371558ccde14c..ae312ccc6dd7c0 100644 --- a/block/genhd.c +++ b/block/genhd.c @@ -1679,14 +1679,14 @@ void set_disk_ro(struct gendisk *disk, int flag) struct disk_part_iter piter; struct hd_struct *part; - if (disk->part0.policy != flag) { + if (disk->part0.bdev->bd_read_only != flag) { set_disk_ro_uevent(disk, flag); - disk->part0.policy = flag; + disk->part0.bdev->bd_read_only = flag; } disk_part_iter_init(&piter, disk, DISK_PITER_INCL_EMPTY); while ((part = disk_part_iter_next(&piter))) - part->policy = flag; + part->bdev->bd_read_only = flag; disk_part_iter_exit(&piter); } @@ -1696,7 +1696,7 @@ int bdev_read_only(struct block_device *bdev) { if (!bdev) return 0; - return bdev->bd_part->policy; + return bdev->bd_read_only; } EXPORT_SYMBOL(bdev_read_only); diff --git a/block/ioctl.c b/block/ioctl.c index a6d8171221c7dc..d61d652078f41c 100644 --- a/block/ioctl.c +++ b/block/ioctl.c @@ -345,7 +345,7 @@ static int blkdev_roset(struct block_device *bdev, fmode_t mode, if (ret) return ret; } - bdev->bd_part->policy = n; + bdev->bd_read_only = n; return 0; } diff --git a/block/partitions/core.c b/block/partitions/core.c index d1093adf2570e2..f397ec9922bd6e 100644 --- a/block/partitions/core.c +++ b/block/partitions/core.c @@ -199,7 +199,7 @@ static ssize_t part_ro_show(struct device *dev, struct device_attribute *attr, char *buf) { struct hd_struct *p = dev_to_part(dev); - return sprintf(buf, "%d\n", p->policy ? 1 : 0); + return sprintf(buf, "%d\n", p->bdev->bd_read_only); } static ssize_t part_alignment_offset_show(struct device *dev, @@ -420,7 +420,7 @@ static struct hd_struct *add_partition(struct gendisk *disk, int partno, bdev->bd_start_sect = start; bdev_set_nr_sectors(bdev, len); p->partno = partno; - p->policy = get_disk_ro(disk); + bdev->bd_read_only = get_disk_ro(disk); if (info) { err = -ENOMEM; diff --git a/include/linux/blk_types.h b/include/linux/blk_types.h index b237f1e4081405..758cf71c9aa2a6 100644 --- a/include/linux/blk_types.h +++ b/include/linux/blk_types.h @@ -23,6 +23,7 @@ struct block_device { sector_t bd_start_sect; struct disk_stats __percpu *bd_stats; unsigned long bd_stamp; + bool bd_read_only; /* read-only policy */ dev_t bd_dev; int bd_openers; struct inode * bd_inode; /* will die */ diff --git a/include/linux/genhd.h b/include/linux/genhd.h index 349cf6403ccddc..dcbf9ef7610ea6 100644 --- a/include/linux/genhd.h +++ b/include/linux/genhd.h @@ -55,7 +55,7 @@ struct hd_struct { struct block_device *bdev; struct device __dev; - int policy, partno; + int partno; struct rcu_work rcu_work; }; @@ -278,7 +278,7 @@ extern void set_disk_ro(struct gendisk *disk, int flag); static inline int get_disk_ro(struct gendisk *disk) { - return disk->part0.policy; + return disk->part0.bdev->bd_read_only; } extern void disk_block_events(struct gendisk *disk);
Move the policy field to struct block_device and rename it to the more descriptive bd_read_only. Also turn the field into a bool as it is used as such. Signed-off-by: Christoph Hellwig <hch@lst.de> --- block/blk-core.c | 2 +- block/genhd.c | 8 ++++---- block/ioctl.c | 2 +- block/partitions/core.c | 4 ++-- include/linux/blk_types.h | 1 + include/linux/genhd.h | 4 ++-- 6 files changed, 11 insertions(+), 10 deletions(-)