Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

cosa: cdev lock_kernel() pushdown

Browse source 
Signed-off-by: Jonathan Corbet <corbet@lwn.net>
This commit is contained in:
Jonathan Corbet 2008-05-15 09:21:33 -06:00
parent 3db633ee35
commit 0911810755
1 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
drivers/net/wan/cosa.c
View file

@ -92,6 +92,7 @@
#include <linux/spinlock.h> #include <linux/spinlock.h>
#include <linux/mutex.h> #include <linux/mutex.h>
#include <linux/device.h> #include <linux/device.h>
#include <linux/smp_lock.h>
#undef COSA_SLOW_IO /* for testing purposes only */ #undef COSA_SLOW_IO /* for testing purposes only */
@ -970,15 +971,21 @@ static int cosa_open(struct inode *inode, struct file *file)
struct channel_data *chan; struct channel_data *chan;
unsigned long flags; unsigned long flags;
int n; int n;
int ret = 0;
lock_kernel();
if ((n=iminor(file->f_path.dentry->d_inode)>>CARD_MINOR_BITS) if ((n=iminor(file->f_path.dentry->d_inode)>>CARD_MINOR_BITS)
>= nr_cards) >= nr_cards) {
return -ENODEV; ret = -ENODEV;
goto out;
}
cosa = cosa_cards+n; cosa = cosa_cards+n;
if ((n=iminor(file->f_path.dentry->d_inode) if ((n=iminor(file->f_path.dentry->d_inode)
& ((1<<CARD_MINOR_BITS)-1)) >= cosa->nchannels) & ((1<<CARD_MINOR_BITS)-1)) >= cosa->nchannels) {
return -ENODEV; ret = -ENODEV;
goto out;
}
chan = cosa->chan + n; chan = cosa->chan + n;
file->private_data = chan; file->private_data = chan;
@ -987,7 +994,8 @@ static int cosa_open(struct inode *inode, struct file *file)
if (chan->usage < 0) { /* in netdev mode */ if (chan->usage < 0) { /* in netdev mode */
spin_unlock_irqrestore(&cosa->lock, flags); spin_unlock_irqrestore(&cosa->lock, flags);
return -EBUSY; ret = -EBUSY;
goto out;
} }
cosa->usage++; cosa->usage++;
chan->usage++; chan->usage++;
@ -996,7 +1004,9 @@ static int cosa_open(struct inode *inode, struct file *file)
chan->setup_rx = chrdev_setup_rx; chan->setup_rx = chrdev_setup_rx;
chan->rx_done = chrdev_rx_done; chan->rx_done = chrdev_rx_done;
spin_unlock_irqrestore(&cosa->lock, flags); spin_unlock_irqrestore(&cosa->lock, flags);
return 0; out:
unlock_kernel();
return ret;
} }
static int cosa_release(struct inode *inode, struct file *file) static int cosa_release(struct inode *inode, struct file *file)