diff options
| author | Coleman Kane <[email protected]> | 2020-10-18 12:54:21 -0400 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2020-11-02 22:01:19 +0000 |
| commit | ae15f1c1d88d85cc1af8152559d50a4baf5e50c5 (patch) | |
| tree | 8b9a726e8fbf3c56800901d35d92e0bd84ebdb80 /module | |
| parent | 838a2490123a596ac7771894311f17269f47024c (diff) | |
Linux 5.10 compat: check_disk_change() removed
Kernel 5.10 removed check_disk_change() in favor of callers using
the faster bdev_check_media_change() instead, and explicitly forcing
bdev revalidation when they desire that behavior. To preserve prior
behavior, I have wrapped this into a zfs_check_media_change() macro
that calls an inline function for the new API that mimics the old
behavior when check_disk_change() doesn't exist, and just calls
check_disk_change() if it exists.
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Coleman Kane <[email protected]>
Closes #11085
Diffstat (limited to 'module')
| -rw-r--r-- | module/os/linux/zfs/vdev_disk.c | 2 | ||||
| -rw-r--r-- | module/os/linux/zfs/zvol_os.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/module/os/linux/zfs/vdev_disk.c b/module/os/linux/zfs/vdev_disk.c index 858edc63b..7de5c30f7 100644 --- a/module/os/linux/zfs/vdev_disk.c +++ b/module/os/linux/zfs/vdev_disk.c @@ -791,7 +791,7 @@ vdev_disk_io_done(zio_t *zio) vdev_t *v = zio->io_vd; vdev_disk_t *vd = v->vdev_tsd; - if (check_disk_change(vd->vd_bdev)) { + if (zfs_check_media_change(vd->vd_bdev)) { invalidate_bdev(vd->vd_bdev); v->vdev_remove_wanted = B_TRUE; spa_async_request(zio->io_spa, SPA_ASYNC_REMOVE); diff --git a/module/os/linux/zfs/zvol_os.c b/module/os/linux/zfs/zvol_os.c index 2422b331b..0cd2d415c 100644 --- a/module/os/linux/zfs/zvol_os.c +++ b/module/os/linux/zfs/zvol_os.c @@ -503,7 +503,7 @@ zvol_open(struct block_device *bdev, fmode_t flag) if (drop_suspend) rw_exit(&zv->zv_suspend_lock); - check_disk_change(bdev); + zfs_check_media_change(bdev); return (0); |