summaryrefslogtreecommitdiff
path: root/block
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2020-11-23 18:36:02 +0300
committerJens Axboe <axboe@kernel.dk>2020-12-02 00:53:40 +0300
commit83950d359010a493462d58c712b1124c877d1b3b (patch)
tree303ad13fa9390c8764e8dde72119d789f14df769 /block
parentb309e9936347232c724eaa13f70533128b4864e9 (diff)
downloadlinux-83950d359010a493462d58c712b1124c877d1b3b.tar.xz
block: move the policy field to struct block_device
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> Reviewed-by: Jan Kara <jack@suse.cz> Reviewed-by: Hannes Reinecke <hare@suse.de> Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'block')
-rw-r--r--block/blk-core.c2
-rw-r--r--block/genhd.c8
-rw-r--r--block/ioctl.c2
-rw-r--r--block/partitions/core.c4
4 files changed, 8 insertions, 8 deletions
diff --git a/block/blk-core.c b/block/blk-core.c
index 9121390be97a..d64ffcb6f9ae 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 f9c957739d4b..2db1204920a9 100644
--- a/block/genhd.c
+++ b/block/genhd.c
@@ -1687,14 +1687,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);
}
@@ -1704,7 +1704,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 a6d8171221c7..d61d652078f4 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 c068471fa654..060c1be13cd8 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;