block: remove set_device_ro

Fold set_device_ro into its only remaining caller.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/block/genhd.c b/block/genhd.c
index 9387f050c248a7f5d6636fb17cd6a0d086f21196..b85db1f2233c608f49198379f227decfe67071ba 100644 (file)
--- a/block/genhd.c
+++ b/block/genhd.c
@@ -1846,13 +1846,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 96cb454473646862e420d4876e566c611484d122..04255dc5f3bff30a690985e0b5a293551123eadf 100644 (file)
--- 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 03da3f603d309c97a0420b725949e2da3c8bc3fb..52eb592c874a9275548ab354983ebba131b673b3 100644 (file)
--- 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)