forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

sg: cdev lock_kernel() pushdown

Browse source 
Signed-off-by: Jonathan Corbet <corbet@lwn.net>
This commit is contained in:
Jonathan Corbet 2008-05-15 12:22:06 -06:00
parent 04f4ac9d1b
commit eb09d3d4ee
1 changed files with 13 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

16
drivers/scsi/sg.c
View file

@ -49,6 +49,7 @@ static int sg_version_num = 30534; /* 2 digits for each component */
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/scatterlist.h> #include <linux/scatterlist.h>
#include <linux/blktrace_api.h> #include <linux/blktrace_api.h>
#include <linux/smp_lock.h>
#include "scsi.h" #include "scsi.h"
#include <scsi/scsi_dbg.h> #include <scsi/scsi_dbg.h>
@ -227,19 +228,26 @@ sg_open(struct inode *inode, struct file *filp)
int res; int res;
int retval; int retval;
lock_kernel();
nonseekable_open(inode, filp); nonseekable_open(inode, filp);
SCSI_LOG_TIMEOUT(3, printk("sg_open: dev=%d, flags=0x%x\n", dev, flags)); SCSI_LOG_TIMEOUT(3, printk("sg_open: dev=%d, flags=0x%x\n", dev, flags));
sdp = sg_get_dev(dev); sdp = sg_get_dev(dev);
if ((!sdp) || (!sdp->device)) if ((!sdp) || (!sdp->device)) {
unlock_kernel();
return -ENXIO; return -ENXIO;
if (sdp->detached) }
if (sdp->detached) {
unlock_kernel();
return -ENODEV; return -ENODEV;
}
/* This driver's module count bumped by fops_get in <linux/fs.h> */ /* This driver's module count bumped by fops_get in <linux/fs.h> */
/* Prevent the device driver from vanishing while we sleep */ /* Prevent the device driver from vanishing while we sleep */
retval = scsi_device_get(sdp->device); retval = scsi_device_get(sdp->device);
if (retval) if (retval) {
unlock_kernel();
return retval; return retval;
}
if (!((flags & O_NONBLOCK) || if (!((flags & O_NONBLOCK) ||
scsi_block_when_processing_errors(sdp->device))) { scsi_block_when_processing_errors(sdp->device))) {
@ -295,10 +303,12 @@ sg_open(struct inode *inode, struct file *filp)
retval = -ENOMEM; retval = -ENOMEM;
goto error_out; goto error_out;
} }
unlock_kernel();
return 0; return 0;
error_out: error_out:
scsi_device_put(sdp->device); scsi_device_put(sdp->device);
unlock_kernel();
return retval; return retval;
} }