lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

paride: cdev lock_kernel() pushdown

Browse Source 
Signed-off-by: Jonathan Corbet <corbet@lwn.net>
This commit is contained in:
Jonathan Corbet
2008-05-15 10:07:56 -06:00
parent 579174a55f
commit ea2959a297
2 changed files with 23 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
drivers/block/paride/pg.c
View File

@@ -162,6 +162,7 @@ enum {D_PRT, D_PRO, D_UNI, D_MOD, D_SLV, D_DLY};
#include <linux/pg.h> #include <linux/pg.h>
#include <linux/device.h> #include <linux/device.h>
#include <linux/sched.h> /* current, TASK_* */ #include <linux/sched.h> /* current, TASK_* */
#include <linux/smp_lock.h>
#include <linux/jiffies.h> #include <linux/jiffies.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
@@ -515,12 +516,18 @@ static int pg_open(struct inode *inode, struct file *file)
{ {
int unit = iminor(inode) & 0x7f; int unit = iminor(inode) & 0x7f;
struct pg *dev = &devices[unit]; struct pg *dev = &devices[unit];
int ret = 0;
if ((unit >= PG_UNITS) || (!dev->present)) lock_kernel();
return -ENODEV; if ((unit >= PG_UNITS) || (!dev->present)) {
ret = -ENODEV;
goto out;
}
if (test_and_set_bit(0, &dev->access)) if (test_and_set_bit(0, &dev->access)) {
return -EBUSY; ret = -EBUSY;
goto out;
}
if (dev->busy) { if (dev->busy) {
pg_reset(dev); pg_reset(dev);
@@ -533,12 +540,15 @@ static int pg_open(struct inode *inode, struct file *file)
if (dev->bufptr == NULL) { if (dev->bufptr == NULL) {
clear_bit(0, &dev->access); clear_bit(0, &dev->access);
printk("%s: buffer allocation failed\n", dev->name); printk("%s: buffer allocation failed\n", dev->name);
return -ENOMEM; ret = -ENOMEM;
goto out;
} }
file->private_data = dev; file->private_data = dev;
return 0; out:
unlock_kernel();
return ret;
} }
static int pg_release(struct inode *inode, struct file *file) static int pg_release(struct inode *inode, struct file *file)

8
drivers/block/paride/pt.c
View File

@@ -146,6 +146,7 @@ static int (*drives[4])[6] = {&drive0, &drive1, &drive2, &drive3};
#include <linux/mtio.h> #include <linux/mtio.h>
#include <linux/device.h> #include <linux/device.h>
#include <linux/sched.h> /* current, TASK_*, schedule_timeout() */ #include <linux/sched.h> /* current, TASK_*, schedule_timeout() */
#include <linux/smp_lock.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
@@ -650,8 +651,11 @@ static int pt_open(struct inode *inode, struct file *file)
struct pt_unit *tape = pt + unit; struct pt_unit *tape = pt + unit;
int err; int err;
if (unit >= PT_UNITS || (!tape->present)) lock_kernel();
if (unit >= PT_UNITS || (!tape->present)) {
unlock_kernel();
return -ENODEV; return -ENODEV;
}
err = -EBUSY; err = -EBUSY;
if (!atomic_dec_and_test(&tape->available)) if (!atomic_dec_and_test(&tape->available))
@@ -678,10 +682,12 @@ static int pt_open(struct inode *inode, struct file *file)
} }
file->private_data = tape; file->private_data = tape;
unlock_kernel();
return 0; return 0;
out: out:
atomic_inc(&tape->available); atomic_inc(&tape->available);
unlock_kernel();
return err; return err;
} }