Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Linux 6.9 compat: fput for block device release 

With new file-driven API, it is sufficient to `fput` the block device
handle to release it.

Signed-off-by: Ryan Lahfa <ryan@lahfa.xyz>
This commit is contained in:
Ryan Lahfa 2024-06-21 00:39:40 +02:00
parent b1f9a75abb
commit 08f57a3150
2 changed files with 25 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
config/kernel-blkdev.m4
View File

@ -178,6 +178,20 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_BLKDEV_BDEV_RELEASE], [
]) ])
]) ])
dnl #
dnl # 6.9.x API change
dnl # fput() replaces bdev_release()
dnl #
AC_DEFUN([ZFS_AC_KERNEL_SRC_BLKDEV_FPUT], [
ZFS_LINUX_TEST_SRC([fput], [
#include <linux/fs.h>
#include <linux/blkdev.h>
], [
struct file *f = NULL;
fput(f);
])
])
AC_DEFUN([ZFS_AC_KERNEL_BLKDEV_PUT], [ AC_DEFUN([ZFS_AC_KERNEL_BLKDEV_PUT], [
AC_MSG_CHECKING([whether blkdev_put() exists]) AC_MSG_CHECKING([whether blkdev_put() exists])
ZFS_LINUX_TEST_RESULT([blkdev_put], [ ZFS_LINUX_TEST_RESULT([blkdev_put], [
@ -197,7 +211,14 @@ AC_DEFUN([ZFS_AC_KERNEL_BLKDEV_PUT], [
AC_DEFINE(HAVE_BDEV_RELEASE, 1, AC_DEFINE(HAVE_BDEV_RELEASE, 1,
[bdev_release() exists]) [bdev_release() exists])
], [ ], [
ZFS_LINUX_TEST_ERROR([blkdev_put()]) ZFS_LINUX_TEST_RESULT([fput], [
AC_MSG_RESULT(yes)
AC_DEFINE(HAVE_BDEV_RELEASE_VIA_FPUT, 1,
[fput() can release a block device and exists]
)
], [
ZFS_LINUX_TEST_ERROR([blkdev_put()])
])
]) ])
]) ])
]) ])
@ -654,6 +675,7 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_BLKDEV], [
ZFS_AC_KERNEL_SRC_BLKDEV_PUT ZFS_AC_KERNEL_SRC_BLKDEV_PUT
ZFS_AC_KERNEL_SRC_BLKDEV_PUT_HOLDER ZFS_AC_KERNEL_SRC_BLKDEV_PUT_HOLDER
ZFS_AC_KERNEL_SRC_BLKDEV_BDEV_RELEASE ZFS_AC_KERNEL_SRC_BLKDEV_BDEV_RELEASE
ZFS_AC_KERNEL_SRC_BLKDEV_FPUT
ZFS_AC_KERNEL_SRC_BLKDEV_REREAD_PART ZFS_AC_KERNEL_SRC_BLKDEV_REREAD_PART
ZFS_AC_KERNEL_SRC_BLKDEV_INVALIDATE_BDEV ZFS_AC_KERNEL_SRC_BLKDEV_INVALIDATE_BDEV
ZFS_AC_KERNEL_SRC_BLKDEV_LOOKUP_BDEV ZFS_AC_KERNEL_SRC_BLKDEV_LOOKUP_BDEV

2
module/os/linux/zfs/vdev_disk.c
View File

@ -263,6 +263,8 @@ vdev_blkdev_put(zfs_bdev_handle_t *bdh, spa_mode_t mode, void *holder)
{ {
#if defined(HAVE_BDEV_RELEASE) #if defined(HAVE_BDEV_RELEASE)
return (bdev_release(bdh)); return (bdev_release(bdh));
#elif defined(HAVE_BDEV_RELEASE_VIA_FPUT)
return (fput(bdh));
#elif defined(HAVE_BLKDEV_PUT_HOLDER) #elif defined(HAVE_BLKDEV_PUT_HOLDER)
return (blkdev_put(BDH_BDEV(bdh), holder)); return (blkdev_put(BDH_BDEV(bdh), holder));
#else #else