projects / packages / spl.git / blame
| Commit | Line | Data |
|---|---|---|
| c85bbb17 JR |
1 | --- spl-0.6.3/module/splat/splat-ctl.c~ 2014-06-12 22:59:01.000000000 +0200 |
| 2 | +++ spl-0.6.3/module/splat/splat-ctl.c 2015-03-30 21:10:25.522172731 +0200 | |
| 3 | @@ -49,6 +49,7 @@ | |
| 4 | #include <linux/cdev.h> | |
| 5 | #include <linux/fs.h> | |
| 6 | #include <linux/uaccess.h> | |
| 7 | +#include <linux/version.h> | |
| 8 | #include <sys/types.h> | |
| 9 | #include <sys/debug.h> | |
| 10 | #include "splat-internal.h" | |
| 11 | @@ -457,7 +457,11 @@ | |
| 12 | static long | |
| 13 | splat_unlocked_ioctl(struct file *file, unsigned int cmd, unsigned long arg) | |
| 14 | { | |
| 15 | +#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,19,0) | |
| 16 | + unsigned int minor = iminor(file->f_path.dentry->d_inode); | |
| 17 | +#else | |
| 18 | unsigned int minor = iminor(file->f_dentry->d_inode); | |
| 19 | +#endif | |
| 20 | int rc = 0; | |
| 21 | ||
| 22 | /* Ignore tty ioctls */ | |
| 23 | @@ -499,7 +503,11 @@ | |
| 24 | static ssize_t splat_write(struct file *file, const char __user *buf, | |
| 25 | size_t count, loff_t *ppos) | |
| 26 | { | |
| 27 | +#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,19,0) | |
| 28 | + unsigned int minor = iminor(file->f_path.dentry->d_inode); | |
| 29 | +#else | |
| 30 | unsigned int minor = iminor(file->f_dentry->d_inode); | |
| 31 | +#endif | |
| 32 | splat_info_t *info = (splat_info_t *)file->private_data; | |
| 33 | int rc = 0; | |
| 34 | ||
| 35 | @@ -536,7 +544,11 @@ | |
| 36 | static ssize_t splat_read(struct file *file, char __user *buf, | |
| 37 | size_t count, loff_t *ppos) | |
| 38 | { | |
| 39 | +#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,19,0) | |
| 40 | + unsigned int minor = iminor(file->f_path.dentry->d_inode); | |
| 41 | +#else | |
| 42 | unsigned int minor = iminor(file->f_dentry->d_inode); | |
| 43 | +#endif | |
| 44 | splat_info_t *info = (splat_info_t *)file->private_data; | |
| 45 | int rc = 0; | |
| 46 | ||
| 47 | @@ -570,7 +582,11 @@ | |
| 48 | ||
| 49 | static loff_t splat_seek(struct file *file, loff_t offset, int origin) | |
| 50 | { | |
| 51 | +#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,19,0) | |
| 52 | + unsigned int minor = iminor(file->f_path.dentry->d_inode); | |
| 53 | +#else | |
| 54 | unsigned int minor = iminor(file->f_dentry->d_inode); | |
| 55 | +#endif | |
| 56 | splat_info_t *info = (splat_info_t *)file->private_data; | |
| 57 | int rc = -EINVAL; | |
| 58 |