X-Git-Url: https://git.camperquake.de/gitweb.cgi?a=blobdiff_plain;f=include%2Flinux%2Fvfs_compat.h;h=9343f99a5a31142c11b53fe644415aeaf18906d6;hb=8f576c232106b2278f03be06554044eed762641b;hp=371bbc1d116ff01a6fd75f4e3adb1045fa84db04;hpb=28eb9213d89cb25438fcecb86e735cc3edc26ea4;p=zfs.git

diff --git a/include/linux/vfs_compat.h b/include/linux/vfs_compat.h
index 371bbc1..9343f99 100644
--- a/include/linux/vfs_compat.h
+++ b/include/linux/vfs_compat.h
@@ -109,4 +109,26 @@ set_nlink(struct inode *inode, unsigned int nlink)
 }
 #endif /* HAVE_SET_NLINK */
 
+/*
+ * 3.3 API change,
+ * The VFS .create, .mkdir and .mknod callbacks were updated to take a
+ * umode_t type rather than an int.  To cleanly handle both definitions
+ * the zpl_umode_t type is introduced and set accordingly.
+ */
+#ifdef HAVE_CREATE_UMODE_T
+typedef	umode_t		zpl_umode_t;
+#else
+typedef	int		zpl_umode_t;
+#endif
+
+/*
+ * 3.5 API change,
+ * The clear_inode() function replaces end_writeback() and introduces an
+ * ordering change regarding when the inode_sync_wait() occurs.  See the
+ * configure check in config/kernel-clear-inode.m4 for full details.
+ */
+#if defined(HAVE_EVICT_INODE) && !defined(HAVE_CLEAR_INODE)
+#define clear_inode(ip)		end_writeback(ip)
+#endif /* HAVE_EVICT_INODE && !HAVE_CLEAR_INODE */
+
 #endif /* _ZFS_VFS_H */