diff options
| author | Coleman Kane <[email protected]> | 2021-05-11 22:53:02 -0400 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2021-05-27 22:09:26 -0700 |
| commit | 17351a79e28610b31f7baab291af6961185b651e (patch) | |
| tree | 287491e3c48800f81316a6b590ef062efe57c2b6 /include | |
| parent | 1cb517aebd5d4d5243689359632b8d6299057fd4 (diff) | |
linux 5.13 compat: bdevops->revalidate_disk() removed
Linux kernel commit 0f00b82e5413571ed225ddbccad6882d7ea60bc7 removes the
revalidate_disk() handler from struct block_device_operations. This
caused a regression, and this commit eliminates the call to it and the
assignment in the block_device_operations static handler assignment
code, when configure identifies that the kernel doesn't support that
API handler.
Reviewed-by: Colin Ian King <[email protected]>
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Coleman Kane <[email protected]>
Closes #11967
Closes #11977
Diffstat (limited to 'include')
| -rw-r--r-- | include/os/linux/kernel/linux/blkdev_compat.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/os/linux/kernel/linux/blkdev_compat.h b/include/os/linux/kernel/linux/blkdev_compat.h index fe809176f..14cae3563 100644 --- a/include/os/linux/kernel/linux/blkdev_compat.h +++ b/include/os/linux/kernel/linux/blkdev_compat.h @@ -277,18 +277,22 @@ bio_set_bi_error(struct bio *bio, int error) static inline int zfs_check_media_change(struct block_device *bdev) { +#ifdef HAVE_BLOCK_DEVICE_OPERATIONS_REVALIDATE_DISK struct gendisk *gd = bdev->bd_disk; const struct block_device_operations *bdo = gd->fops; +#endif if (!bdev_check_media_change(bdev)) return (0); +#ifdef HAVE_BLOCK_DEVICE_OPERATIONS_REVALIDATE_DISK /* * Force revalidation, to mimic the old behavior of * check_disk_change() */ if (bdo->revalidate_disk) bdo->revalidate_disk(gd); +#endif return (0); } |