diff options
| author | Jonathan Corbet <corbet@lwn.net> | 2008-05-15 13:16:21 -0400 |
|---|---|---|
| committer | Jonathan Corbet <corbet@lwn.net> | 2008-06-20 16:05:48 -0400 |
| commit | 2d863e92ec1b1deb8167d7f5266f754f258e876a (patch) | |
| tree | 03022f90fa2f46ed293fe1d9087794d002afcc86 /drivers | |
| parent | 309c4551c0fa0897d5343c36cbfbfa39f1f41b88 (diff) | |
viotape: cdev lock_kernel pushdown ()
Signed-off-by: Jonathan Corbet <corbet@lwn.net>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/char/viotape.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/char/viotape.c b/drivers/char/viotape.c index 58aad63831f4..af03d2709300 100644 --- a/drivers/char/viotape.c +++ b/drivers/char/viotape.c | |||
| @@ -46,6 +46,7 @@ | |||
| 46 | #include <linux/completion.h> | 46 | #include <linux/completion.h> |
| 47 | #include <linux/proc_fs.h> | 47 | #include <linux/proc_fs.h> |
| 48 | #include <linux/seq_file.h> | 48 | #include <linux/seq_file.h> |
| 49 | #include <linux/smp_lock.h> | ||
| 49 | 50 | ||
| 50 | #include <asm/uaccess.h> | 51 | #include <asm/uaccess.h> |
| 51 | #include <asm/ioctls.h> | 52 | #include <asm/ioctls.h> |
| @@ -687,6 +688,7 @@ static int viotap_open(struct inode *inode, struct file *file) | |||
| 687 | if (op == NULL) | 688 | if (op == NULL) |
| 688 | return -ENOMEM; | 689 | return -ENOMEM; |
| 689 | 690 | ||
| 691 | lock_kernel() | ||
| 690 | get_dev_info(file->f_path.dentry->d_inode, &devi); | 692 | get_dev_info(file->f_path.dentry->d_inode, &devi); |
| 691 | 693 | ||
| 692 | /* Note: We currently only support one mode! */ | 694 | /* Note: We currently only support one mode! */ |
| @@ -717,6 +719,7 @@ static int viotap_open(struct inode *inode, struct file *file) | |||
| 717 | 719 | ||
| 718 | free_op: | 720 | free_op: |
| 719 | free_op_struct(op); | 721 | free_op_struct(op); |
| 722 | unlock_kernel(); | ||
| 720 | return ret; | 723 | return ret; |
| 721 | } | 724 | } |
| 722 | 725 | ||
