X-Git-Url: https://git.camperquake.de/gitweb.cgi?a=blobdiff_plain;f=include%2Flinux%2Fvfs_compat.h;h=1d8a523cd999082edc2650d93ec7de4000c61a1e;hb=3c0e5c0f455576d045fa443cbab74834d70ded55;hp=bbc23a962f149f65441882447c6e804d5648fd20;hpb=7268e1bec8478639b7a1047e02ab931f30bc2f92;p=zfs.git

diff --git a/include/linux/vfs_compat.h b/include/linux/vfs_compat.h
index bbc23a9..1d8a523 100644
--- a/include/linux/vfs_compat.h
+++ b/include/linux/vfs_compat.h
@@ -27,16 +27,39 @@
 #define _ZFS_VFS_H
 
 /*
+ * 2.6.28 API change,
+ * Added insert_inode_locked() helper function, prior to this most callers
+ * used insert_inode_hash().  The older method doesn't check for collisions
+ * in the inode_hashtable but it still acceptible for use.
+ */
+#ifndef HAVE_INSERT_INODE_LOCKED
+static inline int
+insert_inode_locked(struct inode *ip)
+{
+	insert_inode_hash(ip);
+	return (0);
+}
+#endif /* HAVE_INSERT_INODE_LOCKED */
+
+/*
  * 2.6.35 API change,
- * The dentry argument to the .fsync() vfs hook was deemed unused by
- * all filesystem consumers and dropped.  Add a compatibility prototype
- * to ensure correct usage when defining this callback.
+ * Add truncate_setsize() if it is not exported by the Linux kernel.
+ *
+ * Truncate the inode and pages associated with the inode. The pages are
+ * unmapped and removed from cache.
  */
-#ifdef HAVE_2ARGS_FSYNC
-#define ZPL_FSYNC_PROTO(fn, x, y, z)	static int fn(struct file *x, int z)
-#else
-#define ZPL_FSYNC_PROTO(fn, x, y, z)	static int fn(struct file *x, \
-						      struct dentry *y, int z)
-#endif
+#ifndef HAVE_TRUNCATE_SETSIZE
+static inline void
+truncate_setsize(struct inode *ip, loff_t new)
+{
+	struct address_space *mapping = ip->i_mapping;
+
+	i_size_write(ip, new);
+
+	unmap_mapping_range(mapping, new + PAGE_SIZE - 1, 0, 1);
+	truncate_inode_pages(mapping, new);
+	unmap_mapping_range(mapping, new + PAGE_SIZE - 1, 0, 1);
+}
+#endif /* HAVE_TRUNCATE_SETSIZE */
 
 #endif /* _ZFS_VFS_H */