Hi Jens,
this series removes the revalidate_disk() function, which has been a
really odd duck in the last years. The prime reason why most people
use it is because it propagates a size change from the gendisk to
the block_device structure. But it also calls into the rather ill
defined ->revalidate_disk method which is rather useless for the
callers. So this adds a new helper to just propagate the size, and
cleans up all kinds of mess around this area. Follow on patches
will eventuall kill of ->revalidate_disk entirely, but ther are a lot
more patches needed for that.
Diffstat:
Documentation/filesystems/locking.rst | 3 --
block/genhd.c | 9 ++----
drivers/block/nbd.c | 8 ++---
drivers/block/rbd.c | 2 -
drivers/block/rnbd/rnbd-clt.c | 10 +------
drivers/block/virtio_blk.c | 2 -
drivers/block/zram/zram_drv.c | 4 +-
drivers/md/dm-raid.c | 2 -
drivers/md/md-cluster.c | 6 ++--
drivers/md/md-linear.c | 2 -
drivers/md/md.c | 10 +++----
drivers/md/md.h | 2 -
drivers/nvdimm/blk.c | 3 --
drivers/nvdimm/btt.c | 3 --
drivers/nvdimm/bus.c | 9 ++----
drivers/nvdimm/nd.h | 2 -
drivers/nvdimm/pmem.c | 3 --
drivers/nvme/host/core.c | 16 +++++++----
drivers/scsi/sd.c | 6 ++--
fs/block_dev.c | 46 ++++++++++++++++------------------
include/linux/blk_types.h | 4 ++
include/linux/genhd.h | 6 ++--
22 files changed, 74 insertions(+), 84 deletions(-)
Replace bd_invalidate with a new BDEV_NEED_PART_SCAN flag in a bd_flags
variable to better describe the condition.
Signed-off-by: Christoph Hellwig <[email protected]>
---
block/genhd.c | 2 +-
drivers/block/nbd.c | 8 ++++----
fs/block_dev.c | 10 +++++-----
include/linux/blk_types.h | 4 +++-
4 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/block/genhd.c b/block/genhd.c
index 99c64641c3148c..a2c0ec694918e5 100644
--- a/block/genhd.c
+++ b/block/genhd.c
@@ -734,7 +734,7 @@ static void register_disk(struct device *parent, struct gendisk *disk,
if (!bdev)
goto exit;
- bdev->bd_invalidated = 1;
+ set_bit(BDEV_NEED_PART_SCAN, &bdev->bd_flags);
err = blkdev_get(bdev, FMODE_READ, NULL);
if (err < 0)
goto exit;
diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c
index a54f2d155a31a5..15eed210feeff4 100644
--- a/drivers/block/nbd.c
+++ b/drivers/block/nbd.c
@@ -315,7 +315,7 @@ static void nbd_size_update(struct nbd_device *nbd)
bd_set_nr_sectors(bdev, nr_sectors);
set_blocksize(bdev, config->blksize);
} else
- bdev->bd_invalidated = 1;
+ set_bit(BDEV_NEED_PART_SCAN, &bdev->bd_flags);
bdput(bdev);
}
kobject_uevent(&nbd_to_dev(nbd)->kobj, KOBJ_CHANGE);
@@ -1322,7 +1322,7 @@ static int nbd_start_device_ioctl(struct nbd_device *nbd, struct block_device *b
return ret;
if (max_part)
- bdev->bd_invalidated = 1;
+ set_bit(BDEV_NEED_PART_SCAN, &bdev->bd_flags);
mutex_unlock(&nbd->config_lock);
ret = wait_event_interruptible(config->recv_wq,
atomic_read(&config->recv_threads) == 0);
@@ -1500,9 +1500,9 @@ static int nbd_open(struct block_device *bdev, fmode_t mode)
refcount_set(&nbd->config_refs, 1);
refcount_inc(&nbd->refs);
mutex_unlock(&nbd->config_lock);
- bdev->bd_invalidated = 1;
+ set_bit(BDEV_NEED_PART_SCAN, &bdev->bd_flags);
} else if (nbd_disconnected(nbd->config)) {
- bdev->bd_invalidated = 1;
+ set_bit(BDEV_NEED_PART_SCAN, &bdev->bd_flags);
}
out:
mutex_unlock(&nbd_index_mutex);
diff --git a/fs/block_dev.c b/fs/block_dev.c
index 2760292045c082..0207623769715d 100644
--- a/fs/block_dev.c
+++ b/fs/block_dev.c
@@ -881,7 +881,7 @@ struct block_device *bdget(dev_t dev)
bdev->bd_super = NULL;
bdev->bd_inode = inode;
bdev->bd_part_count = 0;
- bdev->bd_invalidated = 0;
+ bdev->bd_flags = 0;
inode->i_mode = S_IFBLK;
inode->i_rdev = dev;
inode->i_bdev = bdev;
@@ -1365,7 +1365,7 @@ int check_disk_change(struct block_device *bdev)
if (__invalidate_device(bdev, true))
pr_warn("VFS: busy inodes on changed media %s\n",
disk->disk_name);
- bdev->bd_invalidated = 1;
+ set_bit(BDEV_NEED_PART_SCAN, &bdev->bd_flags);
if (bdops->revalidate_disk)
bdops->revalidate_disk(bdev->bd_disk);
return 1;
@@ -1390,7 +1390,7 @@ int bdev_disk_changed(struct block_device *bdev, bool invalidate)
lockdep_assert_held(&bdev->bd_mutex);
- bdev->bd_invalidated = 0;
+ clear_bit(BDEV_NEED_PART_SCAN, &bdev->bd_flags);
rescan:
ret = blk_drop_partitions(bdev);
@@ -1528,7 +1528,7 @@ static int __blkdev_get(struct block_device *bdev, fmode_t mode, void *holder,
* The latter is necessary to prevent ghost
* partitions on a removed medium.
*/
- if (bdev->bd_invalidated &&
+ if (test_bit(BDEV_NEED_PART_SCAN, &bdev->bd_flags) &&
(!ret || ret == -ENOMEDIUM))
bdev_disk_changed(bdev, ret == -ENOMEDIUM);
@@ -1558,7 +1558,7 @@ static int __blkdev_get(struct block_device *bdev, fmode_t mode, void *holder,
if (bdev->bd_disk->fops->open)
ret = bdev->bd_disk->fops->open(bdev, mode);
/* the same as first opener case, read comment there */
- if (bdev->bd_invalidated &&
+ if (test_bit(BDEV_NEED_PART_SCAN, &bdev->bd_flags) &&
(!ret || ret == -ENOMEDIUM))
bdev_disk_changed(bdev, ret == -ENOMEDIUM);
if (ret)
diff --git a/include/linux/blk_types.h b/include/linux/blk_types.h
index 63a39e47fc6047..c21eff7efda237 100644
--- a/include/linux/blk_types.h
+++ b/include/linux/blk_types.h
@@ -19,6 +19,8 @@ struct cgroup_subsys_state;
typedef void (bio_end_io_t) (struct bio *);
struct bio_crypt_ctx;
+#define BDEV_NEED_PART_SCAN 0
+
struct block_device {
dev_t bd_dev; /* not a kdev_t - it's a search key */
int bd_openers;
@@ -37,7 +39,7 @@ struct block_device {
struct hd_struct * bd_part;
/* number of times partitions within this device have been opened. */
unsigned bd_part_count;
- int bd_invalidated;
+ unsigned long bd_flags;
spinlock_t bd_size_lock; /* for bd_inode->i_size updates */
struct gendisk * bd_disk;
struct backing_dev_info *bd_bdi;
--
2.28.0
On 9/1/20 11:57 AM, Christoph Hellwig wrote:
> Hi Jens,
>
> this series removes the revalidate_disk() function, which has been a
> really odd duck in the last years. The prime reason why most people
> use it is because it propagates a size change from the gendisk to
> the block_device structure. But it also calls into the rather ill
> defined ->revalidate_disk method which is rather useless for the
> callers. So this adds a new helper to just propagate the size, and
> cleans up all kinds of mess around this area. Follow on patches
> will eventuall kill of ->revalidate_disk entirely, but ther are a lot
> more patches needed for that.
>
I applied and built everything on Jens's for-next, patch #2 was fuzzy but it
applied.
I checked through everything, the only thing that was strange to me is not
calling revalidate_disk_size() in nvdimm, but since it's during attach you point
out it doesn't matter. You can add
Reviewed-by: Josef Bacik <[email protected]>
To the series, thanks,
Josef
Looks good,
Reviewed-by: Johannes Thumshirn <[email protected]>
On 9/1/20 9:57 AM, Christoph Hellwig wrote:
> Hi Jens,
>
> this series removes the revalidate_disk() function, which has been a
> really odd duck in the last years. The prime reason why most people
> use it is because it propagates a size change from the gendisk to
> the block_device structure. But it also calls into the rather ill
> defined ->revalidate_disk method which is rather useless for the
> callers. So this adds a new helper to just propagate the size, and
> cleans up all kinds of mess around this area. Follow on patches
> will eventuall kill of ->revalidate_disk entirely, but ther are a lot
> more patches needed for that.
Applied, thanks.
--
Jens Axboe