mirror of
https://git.proxmox.com/git/mirror_zfs.git
synced 2024-11-17 10:01:01 +03:00
Linux 4.11 compat: remove stub for __put_task_struct
Before kernel 2.6.29 credentials were embedded in task_structs, and zfs had cases where one thread would need to refer to the credential of another thread, forcing it to take a hold on the foreign thread's task_struct to ensure it was not freed. Since 2.6.29, the credential has been moved out of the task_struct into a cred_t. In addition, the mainline kernel originally did not export __put_task_struct() but the RHEL5 kernel did, according to zfsonlinux/spl@e811949a57. As of 2.6.39 the mainline kernel exports it. There is no longer zfs code that takes or releases holds on a task_struct, and so there is no longer any reference to __put_task_struct(). This affects the linux 4.11 kernel because the prototype for __put_task_struct() is in a new include file (linux/sched/task.h) and so the config check failed to detect the exported symbol. Removing the unnecessary stub and corresponding config check. This works on kernels since the oldest one currently supported, 2.6.32 as shipped with Centos/RHEL. Reviewed-by: Chunwei Chen <david.chen@osnexus.com> Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov> Signed-off-by: Olaf Faaland <faaland1@llnl.gov> Closes #608
This commit is contained in:
parent
9a054d54fb
commit
bf8abea4da
@ -33,7 +33,6 @@ AC_DEFUN([SPL_AC_CONFIG_KERNEL], [
|
|||||||
SPL_AC_INODE_TRUNCATE_RANGE
|
SPL_AC_INODE_TRUNCATE_RANGE
|
||||||
SPL_AC_FS_STRUCT_SPINLOCK
|
SPL_AC_FS_STRUCT_SPINLOCK
|
||||||
SPL_AC_KUIDGID_T
|
SPL_AC_KUIDGID_T
|
||||||
SPL_AC_PUT_TASK_STRUCT
|
|
||||||
SPL_AC_KERNEL_FALLOCATE
|
SPL_AC_KERNEL_FALLOCATE
|
||||||
SPL_AC_CONFIG_ZLIB_INFLATE
|
SPL_AC_CONFIG_ZLIB_INFLATE
|
||||||
SPL_AC_CONFIG_ZLIB_DEFLATE
|
SPL_AC_CONFIG_ZLIB_DEFLATE
|
||||||
@ -1085,25 +1084,6 @@ AC_DEFUN([SPL_AC_KUIDGID_T], [
|
|||||||
])
|
])
|
||||||
])
|
])
|
||||||
|
|
||||||
dnl #
|
|
||||||
dnl # 2.6.39 API change,
|
|
||||||
dnl # __put_task_struct() was exported by the mainline kernel.
|
|
||||||
dnl #
|
|
||||||
AC_DEFUN([SPL_AC_PUT_TASK_STRUCT],
|
|
||||||
[AC_MSG_CHECKING([whether __put_task_struct() is available])
|
|
||||||
SPL_LINUX_TRY_COMPILE_SYMBOL([
|
|
||||||
#include <linux/sched.h>
|
|
||||||
], [
|
|
||||||
__put_task_struct(NULL);
|
|
||||||
], [__put_task_struct], [], [
|
|
||||||
AC_MSG_RESULT(yes)
|
|
||||||
AC_DEFINE(HAVE_PUT_TASK_STRUCT, 1,
|
|
||||||
[__put_task_struct() is available])
|
|
||||||
], [
|
|
||||||
AC_MSG_RESULT(no)
|
|
||||||
])
|
|
||||||
])
|
|
||||||
|
|
||||||
dnl #
|
dnl #
|
||||||
dnl # 2.6.35 API change,
|
dnl # 2.6.35 API change,
|
||||||
dnl # Unused 'struct dentry *' removed from vfs_fsync() prototype.
|
dnl # Unused 'struct dentry *' removed from vfs_fsync() prototype.
|
||||||
|
@ -459,22 +459,6 @@ ddi_copyout(const void *from, void *to, size_t len, int flags)
|
|||||||
}
|
}
|
||||||
EXPORT_SYMBOL(ddi_copyout);
|
EXPORT_SYMBOL(ddi_copyout);
|
||||||
|
|
||||||
#ifndef HAVE_PUT_TASK_STRUCT
|
|
||||||
/*
|
|
||||||
* This is only a stub function which should never be used. The SPL should
|
|
||||||
* never be putting away the last reference on a task structure so this will
|
|
||||||
* not be called. However, we still need to define it so the module does not
|
|
||||||
* have undefined symbol at load time. That all said if this impossible
|
|
||||||
* thing does somehow happen PANIC immediately so we know about it.
|
|
||||||
*/
|
|
||||||
void
|
|
||||||
__put_task_struct(struct task_struct *t)
|
|
||||||
{
|
|
||||||
PANIC("Unexpectly put last reference on task %d\n", (int)t->pid);
|
|
||||||
}
|
|
||||||
EXPORT_SYMBOL(__put_task_struct);
|
|
||||||
#endif /* HAVE_PUT_TASK_STRUCT */
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Read the unique system identifier from the /etc/hostid file.
|
* Read the unique system identifier from the /etc/hostid file.
|
||||||
*
|
*
|
||||||
|
Loading…
Reference in New Issue
Block a user