diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/file_compat.h | 14 | ||||
| -rw-r--r-- | include/sys/vnode.h | 5 |
2 files changed, 13 insertions, 6 deletions
diff --git a/include/linux/file_compat.h b/include/linux/file_compat.h index 97bd76396..d5fb2bc60 100644 --- a/include/linux/file_compat.h +++ b/include/linux/file_compat.h @@ -67,11 +67,17 @@ spl_filp_open(const char *name, int flags, int mode, int *err) #define spl_inode_unlock(ip) (up(&(ip)->i_sem)) #endif /* HAVE_INODE_I_MUTEX */ -#ifdef HAVE_KERN_PATH_PARENT -#define spl_kern_path_parent(path, nd) kern_path_parent(path, nd) +#ifdef HAVE_KERN_PATH_PARENT_HEADER +# ifndef HAVE_KERN_PATH_PARENT_SYMBOL +typedef int (*kern_path_parent_t)(const char *, struct nameidata *); +extern kern_path_parent_t kern_path_parent_fn; +# define spl_kern_path_parent(path, nd) kern_path_parent_fn(path, nd) +# else +# define spl_kern_path_parent(path, nd) kern_path_parent(path, nd) +# endif /* HAVE_KERN_PATH_PARENT_SYMBOL */ #else -#define spl_kern_path_parent(path, nd) path_lookup(path, LOOKUP_PARENT, nd) -#endif /* HAVE_KERN_PATH_PARENT */ +# define spl_kern_path_parent(path, nd) path_lookup(path, LOOKUP_PARENT, nd) +#endif /* HAVE_KERN_PATH_PARENT_HEADER */ #endif /* SPL_FILE_COMPAT_H */ diff --git a/include/sys/vnode.h b/include/sys/vnode.h index 36605ca4a..03462bd70 100644 --- a/include/sys/vnode.h +++ b/include/sys/vnode.h @@ -189,8 +189,9 @@ extern file_t *vn_getf(int fd); extern void vn_releasef(int fd); extern int vn_set_pwd(const char *filename); -int vn_init(void); -void vn_fini(void); +int spl_vn_init_kallsyms_lookup(void); +int spl_vn_init(void); +void spl_vn_fini(void); #define VOP_CLOSE vn_close #define VOP_SEEK vn_seek |