mirror of
https://git.proxmox.com/git/mirror_zfs.git
synced 2026-05-22 02:27:36 +03:00
2.6.27+ portability changes
- Added SPL_AC_3ARGS_ON_EACH_CPU configure check to determine if the older 4 argument version of on_each_cpu() should be used or the new 3 argument version. The retry argument was dropped in the new API which was never used anyway. - Updated work queue compatibility wrappers. The old way this worked was to pass a data point when initialized the workqueue. The new API assumed the work item is embedding in a structure and we us container_of() to find that data pointer. - Updated skc->skc_flags to be an unsigned long which is now type checked in the bit operations. This silences the warnings. - Updated autogen products and splat tests accordingly
This commit is contained in:
@@ -0,0 +1,16 @@
|
||||
#ifndef _SPL_SMP_COMPAT_H
|
||||
#define _SPL_SMP_COMPAT_H
|
||||
|
||||
#include <linux/smp.h>
|
||||
|
||||
#ifdef HAVE_3ARGS_ON_EACH_CPU
|
||||
|
||||
#define spl_on_each_cpu(func,info,wait) on_each_cpu(func,info,wait)
|
||||
|
||||
#else
|
||||
|
||||
#define spl_on_each_cpu(func,info,wait) on_each_cpu(func,info,0,wait)
|
||||
|
||||
#endif /* HAVE_3ARGS_ON_EACH_CPU */
|
||||
|
||||
#endif /* _SPL_SMP_COMPAT_H */
|
||||
@@ -0,0 +1,25 @@
|
||||
#ifndef _SPL_WORKQUEUE_COMPAT_H
|
||||
#define _SPL_WORKQUEUE_COMPAT_H
|
||||
|
||||
#include <linux/workqueue.h>
|
||||
#include <sys/types.h>
|
||||
|
||||
#ifdef HAVE_3ARGS_INIT_WORK
|
||||
|
||||
#define delayed_work work_struct
|
||||
|
||||
#define spl_init_work(wq, cb, d) INIT_WORK((wq), (void *)(cb), \
|
||||
(void *)(d))
|
||||
#define spl_init_delayed_work(wq,cb,d) INIT_WORK((wq), (void *)(cb), \
|
||||
(void *)(d))
|
||||
#define spl_get_work_data(d, t, f) (t *)(d)
|
||||
|
||||
#else
|
||||
|
||||
#define spl_init_work(wq, cb, d) INIT_WORK((wq), (void *)(cb));
|
||||
#define spl_init_delayed_work(wq,cb,d) INIT_DELAYED_WORK((wq), (void *)(cb));
|
||||
#define spl_get_work_data(d, t, f) (t *)container_of(d, t, f)
|
||||
|
||||
#endif /* HAVE_3ARGS_INIT_WORK */
|
||||
|
||||
#endif /* _SPL_WORKQUEUE_COMPAT_H */
|
||||
Reference in New Issue
Block a user