diff options
| author | Jonathan Corbet <corbet@lwn.net> | 2008-05-15 10:01:17 -0600 |
|---|---|---|
| committer | Jonathan Corbet <corbet@lwn.net> | 2008-06-20 14:03:43 -0600 |
| commit | 764a4a8e54cdd6efc5928f876aa9e35778f22377 (patch) | |
| tree | 76300e77269d5c3122b3e52d925baea8a4e84253 /drivers/s390/char/tape_char.c | |
| parent | 51a776fa7a7997e726d4a478eda0854c6f9143bd (diff) | |
| download | linux-764a4a8e54cdd6efc5928f876aa9e35778f22377.tar.bz2 | |
drivers/s390: cdev lock_kernel() pushdown
Signed-off-by: Jonathan Corbet <corbet@lwn.net>
Diffstat (limited to 'drivers/s390/char/tape_char.c')
| -rw-r--r-- | drivers/s390/char/tape_char.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/drivers/s390/char/tape_char.c b/drivers/s390/char/tape_char.c index ebe84067bae9..687720b552d1 100644 --- a/drivers/s390/char/tape_char.c +++ b/drivers/s390/char/tape_char.c @@ -14,6 +14,7 @@ #include <linux/types.h> #include <linux/proc_fs.h> #include <linux/mtio.h> +#include <linux/smp_lock.h> #include <asm/uaccess.h> @@ -289,21 +290,26 @@ tapechar_open (struct inode *inode, struct file *filp) if (imajor(filp->f_path.dentry->d_inode) != tapechar_major) return -ENODEV; + lock_kernel(); minor = iminor(filp->f_path.dentry->d_inode); device = tape_get_device(minor / TAPE_MINORS_PER_DEV); if (IS_ERR(device)) { DBF_EVENT(3, "TCHAR:open: tape_get_device() failed\n"); - return PTR_ERR(device); + rc = PTR_ERR(device); + goto out; } rc = tape_open(device); if (rc == 0) { filp->private_data = device; - return nonseekable_open(inode, filp); + rc = nonseekable_open(inode, filp); } - tape_put_device(device); + else + tape_put_device(device); +out: + unlock_kernel(); return rc; } |