mirror of https://github.com/openzfs/zfs.git
Linux 5.17 compat: PDE_DATA() renamed to pde_data()
Upstream commit 359745d78351c6f5442435f81549f0207ece28aa ("proc: remove PDE_DATA() completely") Link: https://lore.kernel.org/all/20211124081956.87711-2-songmuchun@bytedance.com/T/#u Reviewed-by: Tony Hutter <hutter2@llnl.gov> Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov> Signed-off-by: Ahelenia Ziemiańska <nabijaczleweli@nabijaczleweli.xyz> Closes #13004 Closes #12989
This commit is contained in:
parent
a46237106c
commit
5dccd7e8f3
|
@ -1,20 +1,22 @@
|
|||
dnl #
|
||||
dnl # 3.10 API change,
|
||||
dnl # PDE is replaced by PDE_DATA
|
||||
dnl # 5.17 API: PDE_DATA() renamed to pde_data(),
|
||||
dnl # 359745d78351c6f5442435f81549f0207ece28aa ("proc: remove PDE_DATA() completely")
|
||||
dnl #
|
||||
AC_DEFUN([ZFS_AC_KERNEL_SRC_PDE_DATA], [
|
||||
ZFS_LINUX_TEST_SRC([pde_data], [
|
||||
#include <linux/proc_fs.h>
|
||||
], [
|
||||
PDE_DATA(NULL);
|
||||
pde_data(NULL);
|
||||
])
|
||||
])
|
||||
|
||||
AC_DEFUN([ZFS_AC_KERNEL_PDE_DATA], [
|
||||
AC_MSG_CHECKING([whether PDE_DATA() is available])
|
||||
ZFS_LINUX_TEST_RESULT_SYMBOL([pde_data], [PDE_DATA], [], [
|
||||
AC_MSG_CHECKING([whether pde_data() is lowercase])
|
||||
ZFS_LINUX_TEST_RESULT([pde_data], [
|
||||
AC_MSG_RESULT(yes)
|
||||
],[
|
||||
ZFS_LINUX_TEST_ERROR([PDE_DATA])
|
||||
AC_DEFINE(SPL_PDE_DATA, pde_data, [pde_data() is pde_data()])
|
||||
], [
|
||||
AC_MSG_RESULT(no)
|
||||
AC_DEFINE(SPL_PDE_DATA, PDE_DATA, [pde_data() is PDE_DATA()])
|
||||
])
|
||||
])
|
||||
|
|
|
@ -418,7 +418,7 @@ proc_kstat_open(struct inode *inode, struct file *filp)
|
|||
return (rc);
|
||||
|
||||
f = filp->private_data;
|
||||
f->private = PDE_DATA(inode);
|
||||
f->private = SPL_PDE_DATA(inode);
|
||||
|
||||
return (0);
|
||||
}
|
||||
|
|
|
@ -175,7 +175,7 @@ procfs_list_open(struct inode *inode, struct file *filp)
|
|||
|
||||
struct seq_file *f = filp->private_data;
|
||||
procfs_list_cursor_t *cursor = f->private;
|
||||
cursor->procfs_list = PDE_DATA(inode);
|
||||
cursor->procfs_list = SPL_PDE_DATA(inode);
|
||||
cursor->cached_node = NULL;
|
||||
cursor->cached_pos = 0;
|
||||
|
||||
|
|
Loading…
Reference in New Issue