X-Git-Url: https://git.camperquake.de/gitweb.cgi?a=blobdiff_plain;f=include%2Flinux%2Fvfs_compat.h;h=c4e1771ae59fc4b405636d5d8c987aa96e5d97e2;hb=1eb5bfa3dcdaecb19543d9df13131374a7a42947;hp=9343f99a5a31142c11b53fe644415aeaf18906d6;hpb=739a1a82e0f366923e8d9bc8f9ad4b1c680a780b;p=zfs.git

diff --git a/include/linux/vfs_compat.h b/include/linux/vfs_compat.h
index 9343f99..c4e1771 100644
--- a/include/linux/vfs_compat.h
+++ b/include/linux/vfs_compat.h
@@ -115,7 +115,7 @@ set_nlink(struct inode *inode, unsigned int nlink)
  * 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
+#ifdef HAVE_MKDIR_UMODE_T
 typedef	umode_t		zpl_umode_t;
 #else
 typedef	int		zpl_umode_t;
@@ -131,4 +131,14 @@ typedef	int		zpl_umode_t;
 #define clear_inode(ip)		end_writeback(ip)
 #endif /* HAVE_EVICT_INODE && !HAVE_CLEAR_INODE */
 
+/*
+ * 3.6 API change,
+ * The sget() helper function now takes the mount flags as an argument.
+ */
+#ifdef HAVE_5ARG_SGET
+#define zpl_sget(type, cmp, set, fl, mtd)	sget(type, cmp, set, fl, mtd)
+#else
+#define zpl_sget(type, cmp, set, fl, mtd)	sget(type, cmp, set, mtd)
+#endif /* HAVE_5ARG_SGET */
+
 #endif /* _ZFS_VFS_H */