LU-5322 libcfs: handle vfs_rename change in 3.15+ kernels

[fs/lustre-release.git] / lustre / include / linux / lustre_compat25.h

diff --git a/lustre/include/linux/lustre_compat25.h b/lustre/include/linux/lustre_compat25.h
index 24412f2..4ec8e55 100644 (file)
--- a/lustre/include/linux/lustre_compat25.h
+++ b/lustre/include/linux/lustre_compat25.h
@@ -88,6 +88,10 @@ static inline void ll_set_fs_pwd(struct fs_struct *fs, struct vfsmount *mnt,
 #define module_init(a)     late_initcall(a)
 #endif
 
+#ifndef MODULE_ALIAS_FS
+#define MODULE_ALIAS_FS(name)
+#endif
+
 #define LTIME_S(time)                   (time.tv_sec)
 
 #ifdef HAVE_GENERIC_PERMISSION_2ARGS
@@ -336,4 +340,25 @@ static inline struct dentry *d_make_root(struct inode *root)
 #define ll_truncate_pagecache(inode, size) truncate_pagecache(inode, size)
 #endif
 
+#ifdef HAVE_VFS_RENAME_5ARGS
+#define ll_vfs_rename(a, b, c, d) vfs_rename(a, b, c, d, NULL)
+#elif defined HAVE_VFS_RENAME_6ARGS
+#define ll_vfs_rename(a, b, c, d) vfs_rename(a, b, c, d, NULL, 0)
+#else
+#define ll_vfs_rename(a, b, c, d) vfs_rename(a, b, c, d)
+#endif
+
+#ifdef HAVE_VFS_UNLINK_3ARGS
+#define ll_vfs_unlink(a, b) vfs_unlink(a, b, NULL)
+#else
+#define ll_vfs_unlink(a, b) vfs_unlink(a, b)
+#endif
+
+#ifndef HAVE_RADIX_EXCEPTION_ENTRY
+static inline int radix_tree_exceptional_entry(void *arg)
+{
+       return 0;
+}
+#endif
+
 #endif /* _COMPAT25_H */