1 --- zfs-0.6.3/module/zfs/zpl_file.c~ 2014-06-12 22:58:09.000000000 +0200
2 +++ zfs-0.6.3/module/zfs/zpl_file.c 2015-03-30 21:34:49.848900638 +0200
7 +#include <linux/version.h>
8 #include <sys/dmu_objset.h>
9 #include <sys/zfs_vfsops.h>
10 #include <sys/zfs_vnops.h>
13 zpl_ioctl_getflags(struct file *filp, void __user *arg)
15 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,19,0)
16 + struct inode *ip = filp->f_path.dentry->d_inode;
18 struct inode *ip = filp->f_dentry->d_inode;
20 unsigned int ioctl_flags = 0;
21 uint64_t zfs_flags = ITOZ(ip)->z_pflags;
25 zpl_ioctl_setflags(struct file *filp, void __user *arg)
27 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,19,0)
28 + struct inode *ip = filp->f_path.dentry->d_inode;
30 struct inode *ip = filp->f_dentry->d_inode;
32 uint64_t zfs_flags = ITOZ(ip)->z_pflags;
33 unsigned int ioctl_flags;
35 --- zfs-0.6.3/module/zpios/pios.c~ 2014-06-12 22:58:09.000000000 +0200
36 +++ zfs-0.6.3/module/zpios/pios.c 2015-03-30 21:38:27.752243085 +0200
39 #include <sys/dsl_destroy.h>
40 #include <linux/cdev.h>
41 +#include <linux/version.h>
42 #include "zpios-internal.h"
45 @@ -1143,7 +1144,11 @@
47 zpios_unlocked_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
49 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,19,0)
50 + unsigned int minor = iminor(file->f_path.dentry->d_inode);
52 unsigned int minor = iminor(file->f_dentry->d_inode);
56 /* Ignore tty ioctls */
57 @@ -1187,7 +1192,11 @@
58 zpios_write(struct file *file, const char __user *buf,
59 size_t count, loff_t *ppos)
61 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,19,0)
62 + unsigned int minor = iminor(file->f_path.dentry->d_inode);
64 unsigned int minor = iminor(file->f_dentry->d_inode);
66 zpios_info_t *info = (zpios_info_t *)file->private_data;
69 @@ -1224,7 +1233,11 @@
71 zpios_read(struct file *file, char __user *buf, size_t count, loff_t *ppos)
73 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,19,0)
74 + unsigned int minor = iminor(file->f_path.dentry->d_inode);
76 unsigned int minor = iminor(file->f_dentry->d_inode);
78 zpios_info_t *info = (zpios_info_t *)file->private_data;
81 @@ -1258,7 +1271,11 @@
83 static loff_t zpios_seek(struct file *file, loff_t offset, int origin)
85 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,19,0)
86 + unsigned int minor = iminor(file->f_path.dentry->d_inode);
88 unsigned int minor = iminor(file->f_dentry->d_inode);
90 zpios_info_t *info = (zpios_info_t *)file->private_data;