envp[2] = "PATH=/sbin:/usr/sbin:/bin:/usr/bin";
envp[3] = NULL;
- return call_usermodehelper(path, argv, envp, 1);
+ return call_usermodehelper(path, argv, envp, UMH_WAIT_PROC);
}
static uint64_t
return rc;
}
-static int
-zpios_ioctl(struct inode *inode, struct file *file,
- unsigned int cmd, unsigned long arg)
+static long
+zpios_unlocked_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
{
- unsigned int minor = iminor(inode);
+ unsigned int minor = iminor(file->f_dentry->d_inode);
int rc = 0;
/* Ignore tty ioctls */
static long
zpios_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
{
- return zpios_ioctl(file->f_dentry->d_inode, file, cmd, arg);
+ return zpios_unlocked_ioctl(file, cmd, arg);
}
#endif /* CONFIG_COMPAT */
.owner = THIS_MODULE,
.open = zpios_open,
.release = zpios_release,
- .ioctl = zpios_ioctl,
+ .unlocked_ioctl = zpios_unlocked_ioctl,
#ifdef CONFIG_COMPAT
.compat_ioctl = zpios_compat_ioctl,
#endif