Commit 647d87bd authored by Jonathan Corbet's avatar Jonathan Corbet

osst: cdev lock_kernel() pushdown.

Signed-off-by: default avatarJonathan Corbet <corbet@lwn.net>
parent eb09d3d4
...@@ -50,6 +50,7 @@ static const char * osst_version = "0.99.4"; ...@@ -50,6 +50,7 @@ static const char * osst_version = "0.99.4";
#include <linux/moduleparam.h> #include <linux/moduleparam.h>
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/jiffies.h> #include <linux/jiffies.h>
#include <linux/smp_lock.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
#include <asm/dma.h> #include <asm/dma.h>
#include <asm/system.h> #include <asm/system.h>
...@@ -4359,7 +4360,7 @@ static int osst_int_ioctl(struct osst_tape * STp, struct osst_request ** aSRpnt, ...@@ -4359,7 +4360,7 @@ static int osst_int_ioctl(struct osst_tape * STp, struct osst_request ** aSRpnt,
/* Open the device */ /* Open the device */
static int os_scsi_tape_open(struct inode * inode, struct file * filp) static int __os_scsi_tape_open(struct inode * inode, struct file * filp)
{ {
unsigned short flags; unsigned short flags;
int i, b_size, new_session = 0, retval = 0; int i, b_size, new_session = 0, retval = 0;
...@@ -4725,6 +4726,18 @@ static int os_scsi_tape_open(struct inode * inode, struct file * filp) ...@@ -4725,6 +4726,18 @@ static int os_scsi_tape_open(struct inode * inode, struct file * filp)
return retval; return retval;
} }
/* BKL pushdown: spaghetti avoidance wrapper */
static int os_scsi_tape_open(struct inode * inode, struct file * filp)
{
int ret;
lock_kernel();
ret = __os_scsi_tape_open(inode, filp);
unlock_kernel();
return ret;
}
/* Flush the tape buffer before close */ /* Flush the tape buffer before close */
static int os_scsi_tape_flush(struct file * filp, fl_owner_t id) static int os_scsi_tape_flush(struct file * filp, fl_owner_t id)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment