Imported Upstream version 0.6.5.8

[mirror_zfs-debian.git] / include / sys / zpl.h

diff --git a/include/sys/zpl.h b/include/sys/zpl.h
index c7701aae57d09f0516ea88c8bea5c8ef7864d32e..c6085481bb32c62a953f023944b92d3f22a9d37b 100644 (file)
--- a/include/sys/zpl.h
+++ b/include/sys/zpl.h
@@ -25,12 +25,14 @@
 #ifndef        _SYS_ZPL_H
 #define        _SYS_ZPL_H
 
+#include <sys/mntent.h>
 #include <sys/vfs.h>
 #include <linux/aio.h>
 #include <linux/dcache_compat.h>
 #include <linux/exportfs.h>
 #include <linux/falloc.h>
 #include <linux/file_compat.h>
+#include <linux/parser.h>
 #include <linux/task_io_accounting_ops.h>
 #include <linux/vfs_compat.h>
 #include <linux/writeback.h>
@@ -65,11 +67,6 @@ extern const struct file_operations zpl_dir_file_operations;
 /* zpl_super.c */
 extern void zpl_prune_sb(int64_t nr_to_scan, void *arg);
 
-typedef struct zpl_mount_data {
-       const char *z_osname;   /* Dataset name */
-       void *z_data;           /* Mount options string */
-} zpl_mount_data_t;
-
 extern const struct super_operations zpl_super_operations;
 extern const struct export_operations zpl_export_operations;
 extern struct file_system_type zpl_fs_type;
@@ -126,7 +123,7 @@ extern const struct inode_operations zpl_ops_snapdirs;
 extern const struct file_operations zpl_fops_shares;
 extern const struct inode_operations zpl_ops_shares;
 
-#ifdef HAVE_VFS_ITERATE
+#if defined(HAVE_VFS_ITERATE) || defined(HAVE_VFS_ITERATE_SHARED)
 
 #define        DIR_CONTEXT_INIT(_dirent, _actor, _pos) {       \
        .actor = _actor,                                \