[LU-6769] Mellanox backport header (kthread.h) conflicts with newer kernels

• Type: Bug
• Resolution: Fixed
• Priority: Minor
• Fix Version/s: Lustre 2.8.0
• Labels: RTS patch
• Severity: 3
• Assignee: Amir Shehata (Inactive)
• Reporter: Chris Horn

Description

This is very similar to LU-5140, except the conflict is in kthread.h

[  224s] In file included from /usr/src/packages/BUILD/cray-lustre/lnet/klnds/o2iblnd/o2iblnd.h:44,
[  224s]                  from /usr/src/packages/BUILD/cray-lustre/lnet/klnds/o2iblnd/o2iblnd.c:42:
[  224s] /usr/src/kernel-modules-ofed/x86_64/cray_ari_s/include/linux/kthread.h:21: error: redefinition of typedef 'kthread_work_func_t'
[  224s] /usr/src/linux-3.0.101-0.46.1_1.0000.8764/include/linux/kthread.h:55: error: previous declaration of 'kthread_work_func_t' was here
[  224s] /usr/src/kernel-modules-ofed/x86_64/cray_ari_s/include/linux/kthread.h:23: error: redefinition of 'struct kthread_worker'
[  224s] /usr/src/kernel-modules-ofed/x86_64/cray_ari_s/include/linux/kthread.h:29: error: redefinition of 'struct kthread_work'
[  224s] /usr/src/kernel-modules-ofed/x86_64/cray_ari_s/include/linux/kthread.h:75: error: conflicting types for '__init_kthread_worker'
[  224s] /usr/src/linux-3.0.101-0.46.1_1.0000.8764/include/linux/kthread.h:109: error: previous declaration of '__init_kthread_worker' was here
[  224s] /usr/src/kernel-modules-ofed/x86_64/cray_ari_s/include/linux/kthread.h:94: error: conflicting types for 'queue_kthread_work'
[  224s] /usr/src/linux-3.0.101-0.46.1_1.0000.8764/include/linux/kthread.h:128: error: previous declaration of 'queue_kthread_work' was here
[  224s] /usr/src/kernel-modules-ofed/x86_64/cray_ari_s/include/linux/kthread.h:96: error: conflicting types for 'flush_kthread_work'
[  224s] /usr/src/linux-3.0.101-0.46.1_1.0000.8764/include/linux/kthread.h:130: error: previous declaration of 'flush_kthread_work' was here
[  224s] /usr/src/kernel-modules-ofed/x86_64/cray_ari_s/include/linux/kthread.h:97: error: conflicting types for 'flush_kthread_worker'
[  224s] /usr/src/linux-3.0.101-0.46.1_1.0000.8764/include/linux/kthread.h:131: error: previous declaration of 'flush_kthread_worker' was here

I think we just to test for the kthread code and define CONFIG_COMPAT_IS_KTHREAD as appropriate. I have a patch but might not get around to pushing until Monday.

Issue Links

• is related to: LU-6763 redefinition of sk_sleep when using external OFED and CentOS 6.5