diff options
| author | Miloslav Trmač <mitr@redhat.com> | 2010-08-24 22:08:17 +0200 |
|---|---|---|
| committer | Miloslav Trmač <mitr@redhat.com> | 2010-08-24 22:08:17 +0200 |
| commit | 99887dbcfffe481d19991a50811046ead8d12572 (patch) | |
| tree | 616d303a915f22deeeed5d91dc71963f01c22c04 /cryptodev_main.c | |
| parent | 8f102ec49dce4065f5f05a7deb1b47d770aca92b (diff) | |
| parent | 1ba66cab0563708d551e3462c249f1da21695882 (diff) | |
| download | cryptodev-linux-99887dbcfffe481d19991a50811046ead8d12572.tar.gz cryptodev-linux-99887dbcfffe481d19991a50811046ead8d12572.tar.xz cryptodev-linux-99887dbcfffe481d19991a50811046ead8d12572.zip | |
Merge branch 'bugfixes' into userspace
Diffstat (limited to 'cryptodev_main.c')
| -rw-r--r-- | cryptodev_main.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/cryptodev_main.c b/cryptodev_main.c index a056b44..541f177 100644 --- a/cryptodev_main.c +++ b/cryptodev_main.c @@ -768,9 +768,8 @@ clonefd(struct file *filp) return ret; } -static int -cryptodev_ioctl(struct inode *inode, struct file *filp, - unsigned int cmd, unsigned long arg_) +static long +cryptodev_ioctl(struct file *filp, unsigned int cmd, unsigned long arg_) { void __user *arg = (void __user *)arg_; int __user *p = arg; @@ -828,7 +827,7 @@ cryptodev_ioctl(struct inode *inode, struct file *filp, return 0; default: - return ncr_ioctl(pcr->ncr, filp, cmd, arg_); + return ncr_ioctl(pcr->ncr, cmd, arg_); } } @@ -907,7 +906,7 @@ cryptodev_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg_) case CIOCASYMFEAT: case CRIOGET: case CIOCFSESSION: - return cryptodev_ioctl(NULL, file, cmd, arg_); + return cryptodev_ioctl(file, cmd, arg_); case COMPAT_CIOCGSESSION: if (unlikely(copy_from_user(&compat_sop, arg, @@ -955,7 +954,7 @@ static const struct file_operations cryptodev_fops = { .owner = THIS_MODULE, .open = cryptodev_open, .release = cryptodev_release, - .ioctl = cryptodev_ioctl, + .unlocked_ioctl = cryptodev_ioctl, #ifdef CONFIG_COMPAT .compat_ioctl = cryptodev_compat_ioctl, #endif /* CONFIG_COMPAT */ |