X-Git-Url: https://git.camperquake.de/gitweb.cgi?a=blobdiff_plain;f=include%2Flinux%2Fvfs_compat.h;h=74ec95f0869ad56f69f5502e94117b24bf388f6c;hb=b39d3b9f7be925ba9314c336099f31f508e1d940;hp=825a7fd3bb6f137c90c1a4ca76ae304aac118d5e;hpb=5547c2f1bf49802835fd6c52f15115ba344a2a8b;p=zfs.git

diff --git a/include/linux/vfs_compat.h b/include/linux/vfs_compat.h
index 825a7fd..74ec95f 100644
--- a/include/linux/vfs_compat.h
+++ b/include/linux/vfs_compat.h
@@ -94,4 +94,31 @@ bdi_setup_and_register(struct backing_dev_info *bdi,char *name,unsigned int cap)
 }
 #endif /* HAVE_BDI && !HAVE_BDI_SETUP_AND_REGISTER */
 
+/*
+ * 3.2-rc1 API change,
+ * Add set_nlink() if it is not exported by the Linux kernel.
+ *
+ * i_nlink is read-only in Linux 3.2, but it can be set directly in
+ * earlier kernels.
+ */
+#ifndef HAVE_SET_NLINK
+static inline void
+set_nlink(struct inode *inode, unsigned int nlink)
+{
+	inode->i_nlink = 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
+
 #endif /* _ZFS_VFS_H */