| Message ID | 20201116145809.410558-33-hch@lst.de |
|---|---|
| State | New |
| Headers | show |
| Series | [01/78] block: remove the call to __invalidate_device in check_disk_size_change | expand |
On 11/16/20 3:57 PM, Christoph Hellwig wrote: > Fold set_device_ro into its only remaining caller. > > Signed-off-by: Christoph Hellwig <hch@lst.de> > --- > block/genhd.c | 7 ------- > block/ioctl.c | 2 +- > include/linux/genhd.h | 1 - > 3 files changed, 1 insertion(+), 9 deletions(-) > > diff --git a/block/genhd.c b/block/genhd.c > index 8c350fecfe8bfe..b0f0b0cac9aa7f 100644 > --- a/block/genhd.c > +++ b/block/genhd.c > @@ -1843,13 +1843,6 @@ static void set_disk_ro_uevent(struct gendisk *gd, int ro) > kobject_uevent_env(&disk_to_dev(gd)->kobj, KOBJ_CHANGE, envp); > } > > -void set_device_ro(struct block_device *bdev, int flag) > -{ > - bdev->bd_part->policy = flag; > -} > - > -EXPORT_SYMBOL(set_device_ro); > - > void set_disk_ro(struct gendisk *disk, int flag) > { > struct disk_part_iter piter; > diff --git a/block/ioctl.c b/block/ioctl.c > index 96cb4544736468..04255dc5f3bff3 100644 > --- a/block/ioctl.c > +++ b/block/ioctl.c > @@ -371,7 +371,7 @@ static int blkdev_roset(struct block_device *bdev, fmode_t mode, > if (ret) > return ret; > } > - set_device_ro(bdev, n); > + bdev->bd_part->policy = n; > return 0; > } > > diff --git a/include/linux/genhd.h b/include/linux/genhd.h > index 4b22bfd9336e1a..8427ad8bef520d 100644 > --- a/include/linux/genhd.h > +++ b/include/linux/genhd.h > @@ -304,7 +304,6 @@ extern void del_gendisk(struct gendisk *gp); > extern struct gendisk *get_gendisk(dev_t dev, int *partno); > extern struct block_device *bdget_disk(struct gendisk *disk, int partno); > > -extern void set_device_ro(struct block_device *bdev, int flag); > extern void set_disk_ro(struct gendisk *disk, int flag); > > static inline int get_disk_ro(struct gendisk *disk) > Reviewed-by: Hannes Reinecke <hare@suse.de> Cheers, Hannes -- Dr. Hannes Reinecke Kernel Storage Architect hare@suse.de +49 911 74053 688 SUSE Software Solutions GmbH, Maxfeldstr. 5, 90409 Nürnberg HRB 36809 (AG Nürnberg), Geschäftsführer: Felix Imendörffer
diff --git a/block/genhd.c b/block/genhd.c index 8c350fecfe8bfe..b0f0b0cac9aa7f 100644 --- a/block/genhd.c +++ b/block/genhd.c @@ -1843,13 +1843,6 @@ static void set_disk_ro_uevent(struct gendisk *gd, int ro) kobject_uevent_env(&disk_to_dev(gd)->kobj, KOBJ_CHANGE, envp); } -void set_device_ro(struct block_device *bdev, int flag) -{ - bdev->bd_part->policy = flag; -} - -EXPORT_SYMBOL(set_device_ro); - void set_disk_ro(struct gendisk *disk, int flag) { struct disk_part_iter piter; diff --git a/block/ioctl.c b/block/ioctl.c index 96cb4544736468..04255dc5f3bff3 100644 --- a/block/ioctl.c +++ b/block/ioctl.c @@ -371,7 +371,7 @@ static int blkdev_roset(struct block_device *bdev, fmode_t mode, if (ret) return ret; } - set_device_ro(bdev, n); + bdev->bd_part->policy = n; return 0; } diff --git a/include/linux/genhd.h b/include/linux/genhd.h index 4b22bfd9336e1a..8427ad8bef520d 100644 --- a/include/linux/genhd.h +++ b/include/linux/genhd.h @@ -304,7 +304,6 @@ extern void del_gendisk(struct gendisk *gp); extern struct gendisk *get_gendisk(dev_t dev, int *partno); extern struct block_device *bdget_disk(struct gendisk *disk, int partno); -extern void set_device_ro(struct block_device *bdev, int flag); extern void set_disk_ro(struct gendisk *disk, int flag); static inline int get_disk_ro(struct gendisk *disk)
Fold set_device_ro into its only remaining caller. Signed-off-by: Christoph Hellwig <hch@lst.de> --- block/genhd.c | 7 ------- block/ioctl.c | 2 +- include/linux/genhd.h | 1 - 3 files changed, 1 insertion(+), 9 deletions(-)